Merge "Fixing detached cinder-volume role"