Conflicts:
	acceptance/tests/ticket_5477_master_not_dectect_sitepp.rb
	lib/puppet/application/apply.rb
	lib/puppet/configurer.rb
	lib/puppet/configurer/fact_handler.rb
	spec/unit/application/apply_spec.rb
	spec/unit/configurer/fact_handler_spec.rb
	spec/unit/configurer_spec.rb

This adds the node_name_fact setting, which specifies a fact to use to
determine the node name. This allows dynamically determining the node name
without having to modify puppet.conf or command line options.

Using this setting requires modifying auth.conf to allow nodes to request
catalogs not matching their certnames.

For example, this would allow any authenticated node to retrieve any catalog:

  # $confdir/auth.conf
  path ~ /catalog/.+
  allow *

The node_name_fact and node_name_value options are mutually exclusive, because
it is ambiguous which setting should take precedence.

Paired-With: Jacob Helwig <jacob@puppetlabs.com>

The setting node_name_value may now be used for 'puppet apply' or 'puppet
agent' to specify the name for the node. This will not affect the certificate
used by the node, and the node will still be authenticated based on its
certname. The default value for node_name_value is the certname.

This is useful for eg. EC2 nodes whose random hostnames cannot be easily used
to classify them.

Paired-With: Jacob Helwig

    * 2.6.x: (36 commits)
      Updated CHANGELOG for 2.6.7rc1
      (#5073) Download plugins even if you're filtering on tags
      Fix #5610: Prevent unnecessary RAL lookups
      Revert "Merge branch 'ticket/2.6.x/5605' of git://github.com/stschulte/puppet into 2.6.next"
      (#6723) Fix withenv environment restoration bug
      (#6689) Remove extraneous include of Puppet::Util in InventoryActiveRecord
      Remove extra trailing whitespace from lib/puppet/resource.rb
      (#5428) More fully "stub" Puppet::Resource::Reference for use with storedconfigs
      (#6707) Fix typo in rest_authconfig.rb
      (#6689) Make inventory_active_record terminus search quickly
      (#5392) Give a better error when realizing a non-existant resource
      (#2645) Adding a less-stubby test to verify the "system" attribute's behavior
      Update CHANGELOG for 2.6.6
      maint: Remove serialization of InventoryFact values
      maint: Rename InventoryHost to InventoryNode
      Fixed #2645 - Added support for creating system users
      maint: Remove spec run noise
      maint:Refactor of mount provider integration tests
      (#6338) Support searching on metadata in InventoryActiveRecord terminus
      (#6338) Implement search for InventoryActiveRecord facts terminus
      ...

    This merge includes essentially reverting #4904's change to the mount
    type since tests that came in from 2.6.x specified different
    behavior and what's correct is not clear to me.  I've reopened #4904 and
    added it to our backlog, and talked to Nigel about the RFC that's
    currently out on the puppet-users mailing list for a bigger refactor of
    how the mount provider works.

    Manually Resolved Conflicts:
        spec/spec_helper.rb
        spec/unit/indirector/queue_spec.rb

When we eval a resource in transaction.rb it was being skipped when
filtering on tags and downloading the plugins.  There's a lot of
complicated conditions for whether to skip a resource, but this is a
condensed version of the path that was causing plugins not to be
downloaded.

  skip?
    missing_tags?
      !ignore_tags?
        !host_config

The Puppet::Configurer::Downloader creates separate catalogs and applies them
to get custom facts and plugins, so should be setting host_config to false.
Puppet::Util::Settings also sets host_config to false when you call use on
settings, while normal catalog application defaults to true.

Thanks to Stefan Schulte <stefan.schulte@taunusstein.net> for suggesting
the implementation fix.

Manually Resolved Conflicts:
	lib/puppet/resource/type_collection.rb
	spec/unit/configurer_spec.rb
	spec/unit/indirector/catalog/active_record_spec.rb
	spec/unit/resource/type_collection_spec.rb
	spec/unit/transaction/resource_harness_spec.rb

The previous maintenance patch for this file didn't provide as strong of
a guarantee of loading plugins as the code it replaced.
This patch restores the extremely broad exception catching, but prevents
mocha exceptions from being silently ignored.

A test was not testing what it claimed, but the failure exception was
getting swallowed by an unnecessarily broad rescue match.

Paired-With: Nick Lewis <nick@puppetlabs.com>

Replaced uses of the find, search, destroy, and expire methods on
model classes with direct calls to the indirection objects.  Also
removed the old methods that delegated to the indirection object.

Replaced 106806 occurances of ^( +)(.*$) with

The ruby community almost universally (i.e. everyone but Luke, Markus, and the other eleven people
who learned ruby in the 1900s) uses two-space indentation.

3 Examples:

    The code:
        end

        # Tell getopt which arguments are valid
        def test_get_getopt_args
            element = Setting.new :name => "foo", :desc => "anything", :settings => Puppet::Util::Settings.new
            assert_equal([["--foo", GetoptLong::REQUIRED_ARGUMENT]], element.getopt_args, "Did not produce appropriate getopt args")

    becomes:
        end

        # Tell getopt which arguments are valid
        def test_get_getopt_args
          element = Setting.new :name => "foo", :desc => "anything", :settings => Puppet::Util::Settings.new
          assert_equal([["--foo", GetoptLong::REQUIRED_ARGUMENT]], element.getopt_args, "Did not produce appropriate getopt args")

    The code:
            assert_equal(str, val)

            assert_instance_of(Float, result)

        end

        # Now test it with a passed object
    becomes:
          assert_equal(str, val)

          assert_instance_of(Float, result)

        end

        # Now test it with a passed object
    The code:
        end

        assert_nothing_raised do
            klass[:Yay] = "boo"
            klass["Cool"] = :yayness
        end

    becomes:
        end

        assert_nothing_raised do
          klass[:Yay] = "boo"
          klass["Cool"] = :yayness
        end