diff --git a/lib/puppet/util/monkey_patches.rb b/lib/puppet/util/monkey_patches.rb
index 8fd566e24..540d2d70f 100644
--- a/lib/puppet/util/monkey_patches.rb
+++ b/lib/puppet/util/monkey_patches.rb
@@ -1,217 +1,222 @@
 
 unless defined? JRUBY_VERSION
   Process.maxgroups = 1024
 end
 
 module RDoc
   def self.caller(skip=nil)
     in_gem_wrapper = false
     Kernel.caller.reject { |call|
       in_gem_wrapper ||= call =~ /#{Regexp.escape $0}:\d+:in `load'/
     }
   end
 end
 
 
 require "yaml"
 require "puppet/util/zaml.rb"
 
 class Symbol
   def to_zaml(z)
     z.emit("!ruby/sym ")
     to_s.to_zaml(z)
   end
+
   def <=> (other)
     self.to_s <=> other.to_s
-  end
+  end unless method_defined? '<=>'
+
+  def intern
+    self
+  end unless method_defined? 'intern'
 end
 
 [Object, Exception, Integer, Struct, Date, Time, Range, Regexp, Hash, Array, Float, String, FalseClass, TrueClass, Symbol, NilClass, Class].each { |cls|
   cls.class_eval do
     def to_yaml(ignored=nil)
       ZAML.dump(self)
     end
   end
 }
 
 def YAML.dump(*args)
   ZAML.dump(*args)
 end
 
 #
 # Workaround for bug in MRI 1.8.7, see
 #     http://redmine.ruby-lang.org/issues/show/2708
 # for details
 #
 if RUBY_VERSION == '1.8.7'
   class NilClass
     def closed?
       true
     end
   end
 end
 
 class Object
   # ActiveSupport 2.3.x mixes in a dangerous method
   # that can cause rspec to fork bomb
   # and other strange things like that.
   def daemonize
     raise NotImplementedError, "Kernel.daemonize is too dangerous, please don't try to use it."
   end
 
   # The following code allows callers to make assertions that are only
   # checked when the environment variable PUPPET_ENABLE_ASSERTIONS is
   # set to a non-empty string.  For example:
   #
   #   assert_that { condition }
   #   assert_that(message) { condition }
   if ENV["PUPPET_ENABLE_ASSERTIONS"].to_s != ''
     def assert_that(message = nil)
       unless yield
         raise Exception.new("Assertion failure: #{message}")
       end
     end
   else
     def assert_that(message = nil)
     end
   end
 end
 
 # Workaround for yaml_initialize, which isn't supported before Ruby
 # 1.8.3.
 if RUBY_VERSION == '1.8.1' || RUBY_VERSION == '1.8.2'
   YAML.add_ruby_type( /^object/ ) { |tag, val|
     type, obj_class = YAML.read_type_class( tag, Object )
     r = YAML.object_maker( obj_class, val )
     if r.respond_to? :yaml_initialize
       r.instance_eval { instance_variables.each { |name| remove_instance_variable name } }
       r.yaml_initialize(tag, val)
     end
     r
   }
 end
 
 class Array
   # Ruby < 1.8.7 doesn't have this method but we use it in tests
   def combination(num)
     return [] if num < 0 || num > size
     return [[]] if num == 0
     return map{|e| [e] } if num == 1
     tmp = self.dup
     self[0, size - (num - 1)].inject([]) do |ret, e|
       tmp.shift
       ret += tmp.combination(num - 1).map{|a| a.unshift(e) }
     end
   end unless method_defined? :combination
 
   alias :count :length unless method_defined? :count
 end
 
 
 class Symbol
   def to_proc
     Proc.new { |*args| args.shift.__send__(self, *args) }
   end unless method_defined? :to_proc
 end
 
 
 class String
   def lines(separator = $/)
     lines = split(separator)
     block_given? and lines.each {|line| yield line }
     lines
   end
 end
 
 class IO
   def lines(separator = $/)
     lines = split(separator)
     block_given? and lines.each {|line| yield line }
     lines
   end
 
   def self.binread(name, length = nil, offset = 0)
     File.open(name, 'rb') do |f|
       f.seek(offset) if offset > 0
       f.read(length)
     end
   end unless singleton_methods.include?(:binread)
 
   def self.binwrite(name, string, offset = 0)
     File.open(name, 'wb') do |f|
       f.write(offset > 0 ? string[offset..-1] : string)
     end
   end unless singleton_methods.include?(:binwrite)
 
 end
 
 class Range
   def intersection(other)
     raise ArgumentError, 'value must be a Range' unless other.kind_of?(Range)
     return unless other === self.first || self === other.first
 
     start = [self.first, other.first].max
     if self.exclude_end? && self.last <= other.last
       start ... self.last
     elsif other.exclude_end? && self.last >= other.last
       start ... other.last
     else
       start .. [ self.last, other.last ].min
     end
   end unless method_defined? :intersection
 
   alias_method :&, :intersection unless method_defined? :&
 end
 
 # Ruby 1.8.5 doesn't have tap
 module Kernel
   def tap
     yield(self)
     self
   end unless method_defined?(:tap)
 end
 
 # The mv method in Ruby 1.8.5 can't mv directories across devices
 # File.rename causes "Invalid cross-device link", which is rescued, but in Ruby
 # 1.8.5 it tries to recover with a copy and unlink, but the unlink causes the
 # error "Is a directory".  In newer Rubies remove_entry is used
 # The implementation below is what's used in Ruby 1.8.7 and Ruby 1.9
 if RUBY_VERSION == '1.8.5'
   require 'fileutils'
 
   module FileUtils
     def mv(src, dest, options = {})
       fu_check_options options, OPT_TABLE['mv']
       fu_output_message "mv#{options[:force] ? ' -f' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
       return if options[:noop]
       fu_each_src_dest(src, dest) do |s, d|
         destent = Entry_.new(d, nil, true)
         begin
           if destent.exist?
             if destent.directory?
               raise Errno::EEXIST, dest
             else
               destent.remove_file if rename_cannot_overwrite_file?
             end
           end
           begin
             File.rename s, d
           rescue Errno::EXDEV
             copy_entry s, d, true
             if options[:secure]
               remove_entry_secure s, options[:force]
             else
               remove_entry s, options[:force]
             end
           end
         rescue SystemCallError
           raise unless options[:force]
         end
       end
     end
     module_function :mv
 
     alias move mv
     module_function :move
   end
 end
diff --git a/spec/unit/util/monkey_patches_spec.rb b/spec/unit/util/monkey_patches_spec.rb
index 5e4e073d1..74dbb3fbe 100755
--- a/spec/unit/util/monkey_patches_spec.rb
+++ b/spec/unit/util/monkey_patches_spec.rb
@@ -1,174 +1,181 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
 
 require 'puppet/util/monkey_patches'
 
 
+describe Symbol do
+  it "should return self from #intern" do
+    symbol = :foo
+    symbol.should equal symbol.intern
+  end
+end
+
 
 describe "yaml deserialization" do
   it "should call yaml_initialize when deserializing objects that have that method defined" do
     class Puppet::TestYamlInitializeClass
       attr_reader :foo
 
       def yaml_initialize(tag, var)
         var.should == {'foo' => 100}
         instance_variables.should == []
         @foo = 200
       end
     end
 
     obj = YAML.load("--- !ruby/object:Puppet::TestYamlInitializeClass\n  foo: 100")
     obj.foo.should == 200
   end
 
   it "should not call yaml_initialize if not defined" do
     class Puppet::TestYamlNonInitializeClass
       attr_reader :foo
     end
 
     obj = YAML.load("--- !ruby/object:Puppet::TestYamlNonInitializeClass\n  foo: 100")
     obj.foo.should == 100
   end
 end
 
 # In Ruby > 1.8.7 this is a builtin, otherwise we monkey patch the method in
 describe "Array#combination" do
   it "should fail if wrong number of arguments given" do
     lambda { [1,2,3].combination() }.should raise_error(ArgumentError, /wrong number/)
     lambda { [1,2,3].combination(1,2) }.should raise_error(ArgumentError, /wrong number/)
   end
 
   it "should return an empty array if combo size than array size or negative" do
     [1,2,3].combination(4).to_a.should == []
     [1,2,3].combination(-1).to_a.should == []
   end
 
   it "should return an empty array with an empty array if combo size == 0" do
     [1,2,3].combination(0).to_a.should == [[]]
   end
 
   it "should all provide all combinations of size passed in" do
     [1,2,3,4].combination(1).to_a.should == [[1], [2], [3], [4]]
     [1,2,3,4].combination(2).to_a.should == [[1, 2], [1, 3], [1, 4], [2, 3], [2, 4], [3, 4]]
     [1,2,3,4].combination(3).to_a.should == [[1, 2, 3], [1, 2, 4], [1, 3, 4], [2, 3, 4]]
   end
 end
 
 describe IO do
   include PuppetSpec::Files
 
   let(:file) { tmpfile('io-binary') }
   let(:content) { "\x01\x02\x03\x04" }
 
   describe "::binread" do
     it "should read in binary mode" do
       File.open(file, 'wb') {|f| f.write(content) }
       IO.binread(file).should == content
     end
 
     it "should read with a length and offset" do
       offset = 1
       length = 2
       File.open(file, 'wb') {|f| f.write(content) }
       IO.binread(file, length, offset).should == content[offset..length]
     end
 
     it "should raise an error if the file doesn't exist" do
       expect { IO.binread('/path/does/not/exist') }.to raise_error(Errno::ENOENT)
     end
   end
 
   describe "::binwrite" do
     it "should write in binary mode" do
       IO.binwrite(file, content).should == content.length
       File.open(file, 'rb') {|f| f.read.should == content }
     end
 
     it "should write using an offset" do
       offset = 1
       IO.binwrite(file, content, offset).should == content.length - offset
       File.open(file, 'rb') {|f| f.read.should == content[offset..-1] }
     end
 
     it "should raise an error if the file doesn't exist" do
       expect { IO.binwrite('/path/does/not/exist', 'foo') }.to raise_error(Errno::ENOENT)
     end
   end
 end
 
 describe Range do
   def do_test( range, other, expected )
     result = range.intersection(other)
     result.should == expected
   end
 
   it "should return expected ranges for iterable things" do
     iterable_tests = {
       1  .. 4   => nil,          # before
       11 .. 15  => nil,          # after
       1  .. 6   => 5  ..  6,     # overlap_begin
       9  .. 15  => 9  ..  10,    # overlap_end
       1  .. 5   => 5  ..  5,     # overlap_begin_edge
       10 .. 15  => 10 ..  10,    # overlap_end_edge
       5  .. 10  => 5  ..  10,    # overlap_all
       6  .. 9   => 6  ..  9,     # overlap_inner
 
       1 ... 5   => nil,          # before             (exclusive range)
       1 ... 7   => 5  ... 7,     # overlap_begin      (exclusive range)
       1 ... 6   => 5  ... 6,     # overlap_begin_edge (exclusive range)
       5 ... 11  => 5  ..  10,    # overlap_all        (exclusive range)
       6 ... 10  => 6  ... 10,    # overlap_inner      (exclusive range)
     }
 
     iterable_tests.each do |other, expected|
       do_test( 5..10, other, expected )
       do_test( other, 5..10, expected )
     end
   end
 
   it "should return expected ranges for noniterable things" do
     inclusive_base_case = {
       1.to_f  .. 4.to_f   => nil,                   # before
       11.to_f .. 15.to_f  => nil,                   # after
       1.to_f  .. 6.to_f   => 5.to_f  ..  6.to_f,    # overlap_begin
       9.to_f  .. 15.to_f  => 9.to_f  ..  10.to_f,   # overlap_end
       1.to_f  .. 5.to_f   => 5.to_f  ..  5.to_f,    # overlap_begin_edge
       10.to_f .. 15.to_f  => 10.to_f ..  10.to_f,   # overlap_end_edge
       5.to_f  .. 10.to_f  => 5.to_f  ..  10.to_f,   # overlap_all
       6.to_f  .. 9.to_f   => 6.to_f  ..  9.to_f,    # overlap_inner
 
       1.to_f ... 5.to_f   => nil,                   # before             (exclusive range)
       1.to_f ... 7.to_f   => 5.to_f  ... 7.to_f,    # overlap_begin      (exclusive range)
       1.to_f ... 6.to_f   => 5.to_f  ... 6.to_f,    # overlap_begin_edge (exclusive range)
       5.to_f ... 11.to_f  => 5.to_f  ..  10.to_f,   # overlap_all        (exclusive range)
       6.to_f ... 10.to_f  => 6.to_f  ... 10.to_f,   # overlap_inner      (exclusive range)
     }
 
     inclusive_base_case.each do |other, expected|
       do_test( 5.to_f..10.to_f, other, expected )
       do_test( other, 5.to_f..10.to_f, expected )
     end
 
     exclusive_base_case = {
       1.to_f  .. 4.to_f   => nil,                   # before
       11.to_f .. 15.to_f  => nil,                   # after
       1.to_f  .. 6.to_f   => 5.to_f  ..  6.to_f,    # overlap_begin
       9.to_f  .. 15.to_f  => 9.to_f  ... 10.to_f,   # overlap_end
       1.to_f  .. 5.to_f   => 5.to_f  ..  5.to_f,    # overlap_begin_edge
       10.to_f .. 15.to_f  => nil,                   # overlap_end_edge
       5.to_f  .. 10.to_f  => 5.to_f  ... 10.to_f,   # overlap_all
       6.to_f  .. 9.to_f   => 6.to_f  ..  9.to_f,    # overlap_inner
 
       1.to_f ... 5.to_f   => nil,                   # before             (exclusive range)
       1.to_f ... 7.to_f   => 5.to_f  ... 7.to_f,    # overlap_begin      (exclusive range)
       1.to_f ... 6.to_f   => 5.to_f  ... 6.to_f,    # overlap_begin_edge (exclusive range)
       5.to_f ... 11.to_f  => 5.to_f  ... 10.to_f,   # overlap_all        (exclusive range)
       6.to_f ... 10.to_f  => 6.to_f  ... 10.to_f,   # overlap_inner      (exclusive range)
     }
 
     exclusive_base_case.each do |other, expected|
       do_test( 5.to_f...10.to_f, other, expected )
       do_test( other, 5.to_f...10.to_f, expected )
     end
   end
 end