Add additional commits to CHANGELOG missed in 2.7.19rc1
(#15803) add self.instances to zpool provider

- Adds self.instances which makes use of zpool list
- Adds a test case for checking that it works.
Use Win32 API atomic replace in `replace_file`

The changes to enable Windows support in `replace_file` were not actually
complete, and it didn't work when the file didn't exist - because of
limitations of the emulation done on our side, rather than anything else.

Windows has a bunch of quirks, and Ruby doesn't actually abstract over the
underlying platform a great deal.  We can use the Windows API ReplaceFile, and
MoveFileEx, to achieve the desired behaviour though.

This adds even more conditional code inside the `replace_file` method to
handle multiple platforms - but it really isn't very clean.  Better to get
this working now, then refactor, though.

Cherry pick of: 73e302bbf5ab4a6c5513a39070e2c907542775ae

Conflicts:

	lib/puppet/util.rb
	spec/unit/util_spec.rb
(#15471) Ensure non-root can read report summary

The security fix for locking down the last_run_report, which contains
sensitive information, also locked down the last_run_summary, which does
not contain sensitive information. Unfortunately this file is often used
by monitoring systems so that they can track puppet runs. Since the
agent runs as root and the monitoring systems do not, this caused the
summary to become unreadable by the monitoring systems.

This commit returns the summary to being world readable which undoes
part of the change done in fd44bf5e6d0d360f6a493d663b653c121fa83c3f
(#15471) Fix setting mode of last_run_summary

The writlock function didn't work with setting the mode on the
last_run_summary file. This backports some of the work in commit
7d8fd144949f21eff924602c2a6b7f130f1c0b69. Specifically, the changes
from using writelock to replace_file for saving the summary file. This
builds on top of the backport of getting replace_file to work on
windows.
(Maint) Add cprice to Git mailmap

Without this patch I noticed the git log contains both Chris Price and
cprice as separate authors.  This patch fixes the problem by normalizing
them to Chris Price <chris@puppetlabs.com>
(Maint) Move Trollop inside of Puppet

The Trollop library is improperly vendored inside of Puppet without this
patch applied.  This is a problem because end users or developers who
have the trollop gem installed will be monkey patched by Puppet since we
open up the top level Trollop module namespace.

This patch fixes the problem by placing Trollop in the namespace of
Puppet::Util::CommandLine::Trollop.  This fixes the problem because the
only place Trollop is used by Puppet is inside the
Puppet::Util::CommandLine class.  Therefore we no longer need to use the
absolute namespace notation of the leading ::.

This also prevents us from monkey patching the real Trollop gem that
lives at ::Trollop if it's been loaded into the process.
(Maint) Use $LOAD_PATH instead of $:

This is just slightly more readable.
(Maint) Clean up markdown in README_DEVELOPER

Without this patch the README_DEVELOPER file displays poorly in my Vim
buffers.  This patch adds some additional markup to separate the code
snippets from the prose.
(#15337) Do not merge user and system puppet.conf

Puppet 3.x reads settings from both ~/.puppet/puppet.conf and the system
puppet.conf without this patch applied.  This is a problem because it
makes it difficult to determine where to load plugins and extensions
from at runtime.  Merging the configuration file also makes it more
difficult to explain where a particular setting is taking effect.

This patch makes the intended `puppet.conf` reading behavior the
following:

 1: If provided, use explicit puppet.conf in `--confdir`
 2: If root, use system puppet.conf
 3: Otherwise, use ~/.puppet/puppet.conf

This patch also changes the behavior of rack puppet master applications.
We now intended for the rack configuration file, `config.ru` to
explicitly set `--confdir` to avoid reading from
`~/.puppet/puppet.conf`.  Please see the example in
`ext/rack/files/config.ru` for an up to date rack configuration.
Fixed #11686 - Updated documentation for exec timeout

The exec timeout of 300 seconds was previously not mentioned in the
exec type documentation. This commit makes the default value clear.
Merge pull request #1007 from nfagerlund/tickets/master/11686

Fixed #11686 - Updated documentation for exec timeout
Merge remote-tracking branch 'rahul/ticket/3.x/15803_zpool_instances' into 3.x

* rahul/ticket/3.x/15803_zpool_instances:
  (#15803) add self.instances to zpool provider
(#15803) Split string for ruby 1.9

Previously, the spec test passed on ruby 1.8, because String includes
the Enumerable module, so that the collect method could be called on the
string. This doesn't work in ruby 1.9.

This commit splits the output of the svcs command on newlines, and then
collects the service instances.
Merge branch 'maint/3.x/15803_break' into 3.x

* maint/3.x/15803_break:
  (#15803) Split string for ruby 1.9
(#10978) add instances to smf

Before the addition of smf instances, the smf service instances were not
present in the `puppet resource service` output. Instead it used to
collect the legacy init.d services. This commit adds the self.instances
method which collects the `svcs` output and parses it to find smf
instances. This commit also adds test cases for this feature.
Merge remote-tracking branch 'rahul/ticket/3.x/10978_smf_instances' into 3.x

* rahul/ticket/3.x/10978_smf_instances:
  (#10978) add instances to smf
(#15804) add zfs instances

Before this commit, `puppet resource zfs` would fail to list any zfs
entries since zfs provider did not provide a self.instances method. This
commit adds the self.instances method to the zfs provider.
Merge pull request #1006 from jeffmccune/bug/3.x/15337_dont_merge_puppet_conf

(#15337) Do not merge user and system puppet.conf
Merge remote-tracking branch 'upstream/3.x'

* upstream/3.x:
  (#10978) add instances to smf
  (#15803) Split string for ruby 1.9
  (#15337) Do not merge user and system puppet.conf
  (Maint) Clean up markdown in README_DEVELOPER
  (Maint) Use $LOAD_PATH instead of $:
  (Maint) Move Trollop inside of Puppet
  (Maint) Add cprice to Git mailmap
  (#15803) add self.instances to zpool provider