Merge change 5616 into donut

* changes:
  Revise VpnService to use new vpn.* properties.