Merge "move lvm config and service before managing VG and LV"