Merge "Revert "Revert "Drop cinderv1 endpoints"""