Merge "Drop cinderv1 endpoints"