Merged to master in https://github.com/puppetlabs/puppet/commit/55ca3acbbcc2aa91a3dab3b20046ecdd960746c5
This has passed ci as a part of puppet-agent 6.11.1.227.gc8691fb8