Fix puppet 3.2.x deprecation warnings