Merged to 6.x in https://github.com/puppetlabs/puppet/commit/4c93f0a7cfd88cb9529570537fd83d8148be6ba6
Passed CI in 8b4331b9f5