Merge branch 'fix-14659' into 'master'

Gemfile

Gemfile.lock

lib/refrepo.rb

lib/refrepo/gen/oar-properties.rb

lib/refrepo/gen/puppet/bindg5k.rb

lib/refrepo/gen/puppet/conmang5k.rb

lib/refrepo/gen/puppet/dhcpg5k.rb

lib/refrepo/gen/puppet/kadeployg5k.rb

lib/refrepo/gen/puppet/kavlanngg5k.rb

lib/refrepo/gen/puppet/kwollectg5k.rb

lib/refrepo/gen/puppet/lanpowerg5k.rb

lib/refrepo/gen/puppet/network_monitoring.rb

lib/refrepo/gen/puppet/oarsub-simplifier-aliases.rb

lib/refrepo/gen/puppet/refapi-subset.rb

lib/refrepo/gen/puppet/templates/conman.erb

lib/refrepo/gen/puppet/templates/kavlan-cluster.conf.erb

lib/refrepo/gen/wiki/generators/cpu_parameters.rb

lib/refrepo/gen/wiki/generators/disk_reservation.rb

lib/refrepo/gen/wiki/generators/hardware.rb

lib/refrepo/gen/wiki/generators/kwollect_metrics.rb