Merged to master in https://github.com/puppetlabs/puppet/commit/2e9661f8359ca09387cafd8f783b14f23ec8a5fb. Is there anything else needed for this ticket?
Passed CI in e9107d98e9