Merge branch '0.24.x'

Conflicts:
	bin/ralsh
	lib/puppet/executables/client/certhandler.rb
	lib/puppet/parser/functions/versioncmp.rb
	lib/puppet/parser/resource/reference.rb
	lib/puppet/provider/augeas/augeas.rb
	lib/puppet/provider/nameservice/directoryservice.rb
	lib/puppet/provider/ssh_authorized_key/parsed.rb
	lib/puppet/type.rb
	lib/puppet/type/file/checksum.rb
	spec/integration/defaults.rb
	spec/integration/transaction/report.rb
	spec/unit/executables/client/certhandler.rb
	spec/unit/indirector/ssl_rsa/file.rb
	spec/unit/node/catalog.rb
	spec/unit/provider/augeas/augeas.rb
	spec/unit/rails.rb
	spec/unit/type/ssh_authorized_key.rb
	spec/unit/type/tidy.rb
	test/executables/filebucket.rb
	test/executables/puppetbin.rb

2 files changed, 9 insertions, 2 deletions

diff --git a/lib/puppet/parser/resource/param.rb b/lib/puppet/parser/resource/param.rb
index 1a5cfe8fb..7ce58f4c4 100644
--- a/lib/puppet/parser/resource/param.rb
+++ b/lib/puppet/parser/resource/param.rb
@@ -1,10 +1,14 @@
+require 'puppet/file_collection/lookup'
+
  # The parameters we stick in Resources.
 class Puppet::Parser::Resource::Param
-    attr_accessor :name, :value, :source, :line, :file, :add
+    attr_accessor :name, :value, :source, :add
     include Puppet::Util
     include Puppet::Util::Errors
     include Puppet::Util::MethodHelper
 
+    include Puppet::FileCollection::Lookup
+
     def initialize(hash)
         set_options(hash)
         requiredopts(:name, :value, :source)
diff --git a/lib/puppet/parser/resource/reference.rb b/lib/puppet/parser/resource/reference.rb
index a37f8400d..cf7e997d8 100644
--- a/lib/puppet/parser/resource/reference.rb
+++ b/lib/puppet/parser/resource/reference.rb
@@ -1,7 +1,10 @@
-require 'puppet/resource/reference'
+# A reference to a resource.  Mostly just the type and title.
+require 'puppet/resource_reference'
+require 'puppet/file_collection/lookup'
 
 # A reference to a resource.  Mostly just the type and title.
 class Puppet::Parser::Resource::Reference < Puppet::Resource::Reference
+    include Puppet::FileCollection::Lookup
     include Puppet::Util::MethodHelper
     include Puppet::Util::Errors