Fix Puppet 3.2.x deprecation warnings