Mods from puppetlabs module

Change-Id: Ie2781682cd6b4ee173f422e893028875367f50a1