Merge in vmware_puppetfact module