Merge "Use the proper keystone endpoints in clouds.yaml"