Fix puppet 3.2.1 deprecation warnings