Merge "cinder: switch auth_uri to uri_no_suffix"