Merge "Migrate HostsideNetworkTestCase to use JUnit4"