Merge pull request #4505 from daviddavis/temp/20140730131408
Fixes #6845 - Fix undefined method 'puppet_env' for nil
Merge pull request #4505 from daviddavis/temp/20140730131408
Fixes #6845 - Fix undefined method 'puppet_env' for nil