Fix Puppet 3.2.1 deprecation warnings