Merge "Move _check_tenant_network_connectivity to the end"