(maint) Merge up dd65bf4 to 6.0.x
(maint) Merge up dd65bf4 to 6.0.x

Generated by CI

* commit 'dd65bf4a1cb7fb271c795aeaec7d9086b4e096dc':
  (maint) Fixups for version determination in CI

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