Support Puppet versions 3.5.1 and 3.6.0