Puppet: Addressing feedback from ehelms in #2751
Merge pull request #2752 from daviddavis/temp/20130813102209

Addressing #2751 feedback
Puppet: Addressing more feedback from #2751