Merge "Revert "Drop cinderv1 endpoints""