Merge "Set OS_AUTH_URL to fqdn in keystonercv3 for CC"