Add support for puppet 3.6.x