Added a PR, please review verbiage.
Merged into master at https://github.com/puppetlabs/puppet/commit/25cc6098222ce25aceaacfcff989d815467c69d8
This has passed ci as a part of puppet-agent 6.14.0.94.g47a3ec5d
Josh Cooper could you update the docs tab for this ticket?