Support Puppet versions 3.5.x and 3.6.x