Merge "Stop creating the cinderv1 endpoint"