Merge changes I266f8403,Ia4dc4b23

* changes:
  VpnSettings: hook up the legacy VPN with IConnectivityManager.
  VpnSettings: IPSec Hybrid RSA does not need user certificate.