(maint) Merge branch '6.x' into 'main'
(maint) Merge branch '6.x' into 'main'

Conflicts:
 - resources/ext/build-scripts/mri-gem-list-no-dependencies.txt

puppetlabs/puppet-server,puppetlabs/puppetserver,puppetlabs/puppet-server,puppetlabs/puppetserver,puppetlabs/puppet-server,puppetlabs/puppetserver,puppetlabs/puppetserver