This task should be completed after PUP-7445 code changes, and involves updating any of the following if necessary:
https://github.com/puppetlabs/puppet-runtime/pull/365
https://github.com/puppetlabs/puppet/pull/8251