Merge branch 'main' into IAC-1143

diff --cc Gemfile
index c65a5becca1b8be9b64bde4b1e6d40a99fd3641b,582e584673a2ca031057a1a1b7051446221859b0..3373f01763ea1b3d343658b868bfa5585670ff04
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -30,12 -30,10 +30,10 @@@ group :development d
    gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
    gem "github_changelog_generator",                              require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
    gem "puppet-lint-i18n",                                        require: false
-   gem 'ed25519', '>= 1.2', '< 2.0'
-   gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
  end
  
 -puppet_version = ENV['PUPPET_GEM_VERSION']
 -facter_version = ENV['FACTER_GEM_VERSION']
 +# puppet_version = ENV['PUPPET_GEM_VERSION']
 +# facter_version = ENV['FACTER_GEM_VERSION']
  hiera_version = ENV['HIERA_GEM_VERSION']
  
  gems = {}

diff --cc spec/unit/facter/apt_dist_has_updates_spec.rb
Simple merge