Merged to puppet#4.10.x at https://github.com/puppetlabs/puppet/commit/373377d1c4ca52e5fbe8a7f684d1d394128cd924.
Branan Riley please provide release notes for this issue, if needed. Thanks!