Merge "Cinder client fails if identity API version specified"