am e398151e: Merge change 1694 into donut

Merge commit 'e398151e7830510f27305cc1cb8f9a0510106f9a'

* commit 'e398151e7830510f27305cc1cb8f9a0510106f9a':
  nexus: Flesh out VPN support a bit more, cleanup service handling