Merge changes Ic8231b18,I30009f88 into pi-dev

* changes:
  Fix: VPNs update caps upon underlying network disconnect.
  Add tests for setUnderlyingNetworks.