labs_lvm class tweaks

Change-Id: I032257bb39e16bcaec31a7cf29fe9898a2807638