Merge "Allow get_tenant_network() for non-primary creds"