Merge "Fix _check_network_external_connectivity in test_network_basic_ops"