Merged in https://github.com/puppetlabs/puppet/commit/2f14ddd269c26cba36771d9b3464c2c29422e46a
Passed CI in 93c86d6dc8