Merge branch '2.6.x' into next

* 2.6.x:
  maint: Fix ActiveRecord confine issue
  maint: Fix a test that was missing a require
  maint: Fix tests that don't run on their own

Manually Resolved Conflicts:
	spec/unit/network/http/rack/xmlrpc_spec.rb
	spec/unit/network/http/rack_spec.rb
	spec/unit/network/http/webrick_spec.rb
	spec/unit/parser/templatewrapper_spec.rb
	spec/unit/rails/param_value_spec.rb
	spec/unit/rails/resource_spec.rb

spec/unit/indirector/catalog/active_record_spec.rb

@@ -7,20 +7,23 @@
   confine "Missing Rails" => Puppet.features.rails?
 
   require 'puppet/rails'
-  class Tableless < ActiveRecord::Base
-    def self.columns
-      @columns ||= []
-    end
-    def self.column(name, sql_type=nil, default=nil, null=true)
-      columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
+
+  before :all do
+    class Tableless < ActiveRecord::Base
+      def self.columns
+        @columns ||= []
+      end
+      def self.column(name, sql_type=nil, default=nil, null=true)
+        columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
+      end
     end
-  end
 
-  class Host < Tableless
-    column :name, :string, :null => false
-    column :ip, :string
-    column :environment, :string
-    column :last_compile, :datetime
+    class Host < Tableless
+      column :name, :string, :null => false
+      column :ip, :string
+      column :environment, :string
+      column :last_compile, :datetime
+    end
   end
 
   before do