Merge "Consolidate _check_tenant_network_connectivity in NetworkScenarioTest"