addresses #5020 by merging upstream puppet module changes
Merge pull request #40 from mccun934/20140402-1023

addresses #5020 by merging upstream puppet module changes