Merge change 7917 into donut

* changes:
  Added the vpn unit test template.