Merge change 1694 into donut

* changes:
  nexus: Flesh out VPN support a bit more, cleanup service handling