Merge "Fix cinder volume nameing for admin"