Merge "Deprecate v1 Cinder api - query v{2,3} for alerts/dashboards"