Support newer releases of Puppet