Merge changes from topic "add-ikev2-vpn-types" am: adb79e3b39 am: 6e1557d8ca

Change-Id: I91759cf3b68f89500352c6d952643a45e0665ee2
tree: c1768bbc3f134d4e3c301a1da2a4178f05a3f838
  1. core/
  2. services/
  3. tests/