Merge "Fix wrong cinder controller usage in volume state"