Merge "Cinder: only set volume_clear for LVM"