Merged to master in https://github.com/puppetlabs/puppet/commit/ec1fe7e504143b0634d9d8cfb544ac74f6e7fb1d.
There are still some warnings from rspec-mocks, see https://github.com/puppetlabs/puppet/pull/8179#issuecomment-635475694
Passed CI in f6e4dab7be