This patch add three features to the envpuppet helper script.

First, if --help is passed as the first argument, a helpful message is
printed.

Second, if ENVPUPPET_BLEEDING=true when envpuppet is executed,
additional repositories are enabled.  The only addition at this time is
puppet-interfaces, which heavily modifies the behavior of Puppet itself
and may or may not be desired.

Third, if no arguments are passed to the script, bourne compatible shell
statements are printed to STDOUT which may be directly evaluated in the
current shell.  This is to help people who prefer to directly set
RUBYLIB and PATH in their development workflows, which I've noticed to
be the case for many people.

For example:

    eval $(envpuppet)

Signed-off-by: Jeff McCune <jeff@puppetlabs.com>
Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>

Fix conflicts in the changelog, and one agent spec in favour of the 2.7.next
version of the code.

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

For details of why we're moving please see:

https://groups.google.com/d/topic/puppet-users/NuspYhMpE5o/discussion

Removed explicit GPL licenses where appropriate

Replaced selected GPL licenses with Apache 2.0

Replaced LICENSE with Apache 2.0

Updated README

Vim's indent support makes it easier to automatically indent puppet
manifests.

This was a particularly nasty merge, so rather than hold up merges into
next any longer, I'm going to push this merge with a few outstanding
problems.  The tests that were failing in the following areas have been
marked pending, and will be addressed separately, immediately following
this push.

TODO:
Verify that brice's rdoc change is still valid: tests to show that line
  numbers from class, define and node get into the ast
Fix mount parsed_spec spec/unit/provider/mount/parsed_spec.rb

* 2.6.next: (85 commits)
  (#5148) Fix failing spec due to timezone
  (#5148) Add support for PSON to facts
  (#6338) Remove inventory indirection, and move to facts indirection
  (#6445) Fix inline docs: puppet agent does not accept --mkusers
  Update CHANGELOG and version for 2.6.6rc1
  (#6541) Fix content with checksum truncation bug
  (#6418) Recursive files shouldn't be audited
  (#6541) maint: whitespace cleanup on the file integration spec
  (#6541) Fix content with checksum truncation bug
  (#5466) Write specs for output of puppet resource
  (#5466) Monkey patch Symbol so that you can sort them
  (#5466) Fixed puppet resource bug with trailing ,
  Update CHANGELOG for 2.6.5
  (#4922) Don't truncate remotely-sourced files on 404
  (#6338) Remove unused version control tags
  Maint: Align tabs in a code block in the Augeas type.
  (#6509) Inline docs: Fix erroneous code block in directoryservice provider for computer type
  Maint: Rewrite comments about symlinks to reflect best practice.
  (#6509) Inline docs: Fix broken lists in Launchd provider.
  (#6509) Inline docs: Fix broken code blocks in zpool type
  ...

Manually Resolved Conflicts:
  lib/puppet/application/inspect.rb
  lib/puppet/defaults.rb
  lib/puppet/file_bucket/dipper.rb
  lib/puppet/network/http/handler.rb
  lib/puppet/node/facts.rb
  lib/puppet/parser/parser.rb
  lib/puppet/parser/parser_support.rb
  lib/puppet/util/command_line/puppet
  lib/puppet/util/command_line/puppetd
  lib/puppet/util/command_line/puppetmasterd
  lib/puppet/util/monkey_patches.rb
  lib/puppet/util/rdoc/parser.rb
  spec/unit/application/agent_spec.rb
  spec/unit/file_bucket/file_spec.rb
  spec/unit/indirector/file_bucket_file/file_spec.rb
  spec/unit/network/http/handler_spec.rb
  spec/unit/parser/parser_spec.rb
  spec/unit/provider/mount/parsed_spec.rb

This patch updates links in three files and marks a link in a fourth
file as unrecoverable.

* 2.6.x:
  (#5304) Use internal_name rather than real_name for maillist provider
  Updated CHANGELOG and version for 2.6.4
  Revert "(#5304) Use internal_name rather than real_name for maillist provider"
  Disable remote ralsh by default
  (#5424) Ship auth.conf as part of installing from source
  (#5304) Use internal_name rather than real_name for maillist provider
  Renamed Reductive to Puppet

Manually Resolved Conflicts:
	lib/puppet/provider/maillist/mailman.rb

I swear I've done this before. *confused*

Resolved conflicts manually:
	spec/integration/indirector/bucket_file/rest_spec.rb
	spec/integration/indirector/certificate_revocation_list/rest_spec.rb

Multiple attemps were made to contact the author of this code in order to
obtain a Contributor Licence Agreement, but we were unable to do so.