Merge changes Ib2d54e53,Ieb606d2b

* changes:
  Test if underlying networks are the same as what VpnService sets
  Convert VpnTest to JUnit4