Merge "Cinder dashboard rationalization"