Fix deprecation warnings due to Puppet upgrade