Merged to 6.x in https://github.com/puppetlabs/puppet/commit/82b27f01268fc5da4bce29cf52bc1f4eb17c95bf
Follow up merged to 6.x in https://github.com/puppetlabs/puppet/commit/376d0aa36235f9401e82655280308d46adca2b48
Passed CI in puppet#95ee122621