Merge remote-tracking branch 'upstream/3.6.x' into 3.9.x

* upstream/3.6.x:
  (maint) Explicitly require beaker-vagrant for acceptance
  (maint) Explicitly require beaker-vmpooler for acceptance
  (maint) Use beaker 4 by default in acceptance

acceptance/Gemfile

@@ -10,10 +10,12 @@ def location_for(place, fake_version = nil)
   end
 end
 
-gem "beaker", *location_for(ENV['BEAKER_VERSION'] || "~> 3.34")
-gem 'beaker-puppet', *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 0.13')
+gem "beaker", *location_for(ENV['BEAKER_VERSION'] || "~> 4")
+gem 'beaker-puppet', *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 1')
 gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || "~> 1.1")
 gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || "~> 0.5")
+gem "beaker-vagrant", *location_for(ENV['BEAKER_VAGRANT_VERSION'] || "~> 0")
+gem "beaker-vmpooler", *location_for(ENV['BEAKER_VMPOOLER_VERSION'] || "~> 1")
 gem 'rake', "~> 10.1.0"
 gem "multi_json", "~> 1.8"