Merge changes Ieb7f33bc,I81b56862

* changes:
  Fix the legacy VPN tests that start racoon.
  Make testLegacyLockdownVpn more realistic.