Merged to 6.x in https://github.com/puppetlabs/puppet/commit/284f3d6bc6432f355e71a177f7a2d554bb879d65
Passed CI in 57fd4e4c4e