add changes from liquidm
update for ohai 7