Merge remote-tracking branch 'puppetlabs/6.x' into main

* puppetlabs/6.x:
  (packaging) Updating manpage file for 6.x
  (packaging) Bump to version '6.24.0' [no-promote]

# Conflicts:
#	.gemspec
#	lib/puppet/version.rb
#	man/man5/puppet.conf.5
#	man/man8/puppet.8

Author: mihaibuzgau