Support Puppet v3.5.1 and v3.6.0