Merged to 6.x in https://github.com/puppetlabs/puppet/commit/6cfed40fa7856952c3bc57f24c3e1cf2c94609b8
Passed CI in 0fc096f07e