Merge changes from topic "vpn-api-fixes"

* changes:
  Test getProvisionedVpnProfileState
  Make test networks not be VPNs