Merge changes I98573a5c,Ic7394f24

* changes:
  Enable checks for MANAGE_TEST_NETWORKS in TestNetworkService
  Cleanup of Test Network service