This ticket is to clean up and finish the work started in https://github.com/puppetlabs/puppet/pull/5547
Is https://github.com/puppetlabs/puppet/pull/5636 also part of this PR?