Merge "Change CINDER_LVM_TYPE to 'auto' as the default"