Merge "Allow v3 identity to work without the admin domain name"