Fixed merge conflicts between lvm/3.3.x and master
Fixed merge conflicts between lvm/3.3.x and master

puppetlabs/pltraining-userprefs,natemccurdy/pltraining-userprefs,natemccurdy/pltraining-userprefs,samuelson/pltraining-userprefs,joshsamuelson/pltraining-userprefs,carthik/pltraining-userprefs,puppetlabs/pltraining-userprefs,binford2k/pltraining-userprefs,samuelson/pltraining-userprefs,carthik/pltraining-userprefs,samuelson/pltraining-userprefs,joshsamuelson/pltraining-userprefs