Merge "lib/cinder: Remove 'volume3' endpoint"