Merge "Add support for cinder v3 endpoint"