Merge "Allow domain scope users to manage credentials"