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

Conflicts:
 - Gemfile
 - acceptance/config/beaker/options.rb
 - acceptance/suites/puppet5_tests/puppet5_version_test.rb
 - ruby/puppet

Author: justinstoller