Revert "Regress to Puppet 3.0.x"

This reverts commit 2d37e0c1037580a47a937f46c12f6f949eb2dd2b.