am 836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev

* commit '836eff87a93f5b2857b41763197ab6782581aafc':
  Add legacy VPN test framework and test cases