Clarify the messages provided by the Debian puppet agent and master init scripts.
Merge pull request #1404 from pdxmph/master

(#18468) Further clarify messages in defaults for Debian init scripts.
(#15980) The pip provider doesn't work correctly on redhat based systems

Centos/RHEL/Fedora all use pip-python instead of pip
(#15980) Test to verify that pip-python is used on Redhat systems
(#15980) Tests to confirm functionality of the cmd function
(#15980) wrapping tests so that they're tested on both 'RedHat' and 'Not
Redhat' sytems
Merge branch 'jaredcurtis-fix/master/15980'

* jaredcurtis-fix/master/15980:
  (#15980) wrapping tests so that they're tested on both 'RedHat' and 'Not Redhat' sytems
  (#15980) Tests to confirm functionality of the cmd function
  (#15980) Test to verify that pip-python is used on Redhat systems
  (#15980) The pip provider doesn't work correctly on redhat based systems

closes: #1348
(#17777) Update debian build-depends to only use ruby1.8

Previously puppet had a build-depends of ruby, which means that on wheezy and
quantal, the default ruby of ruby1.9 was used to build puppet. Unfortunately,
this means that the shebangs for bin/puppet refer to bin/ruby1.9.1 instead of
ruby1.8. Puppet 2.7.x is installed in the ruby 1.8 specific libdir for ruby, so
ruby1.9.1 has no way of loading puppet in this case. This commit updates the
build-depends to correctly use ruby1.8 only, so bin/puppet gets the correct
ruby which can load the correct libraries.
Note: in mergeups from 2.7.x, this
needs to be undone. The build-depends of ruby is correct for puppet 3 and
later.
Merge pull request #1412 from haus/ticket/2.7.x/17777_update_build_depends

(#17777) Update debian build-depends to only use ruby1.8
Merge branch '2.7.x' into 3.0.x

Keep 3.0.x Build-Depends of ruby (not the 2.7.x Build-Depends of ruby1.8)

Conflicts:
	ext/debian/control
Merge branch '3.0.x'
(#14872) PMT respect environment's module path

This is a second version of a patch which fixes the
Puppet::ModuleTool#set_option_defaults method such that it respects
the specified environment (if any) when determining the default
value for the --target-dir (the modules install directory) option.
The patch overhauls the entire method in the process to make it more
readable, and it also updates relevant unit tests and adds a pair
of new acceptance tests (which in contrast to the original patch
version don't depend on augeas).

Reviewed by: Patrick Carlisle <patrick@puppetlabs.com>
Merge branch 'ticket/14782-pmt-respect-environments'

* ticket/14782-pmt-respect-environments:
  (#14872) PMT respect environment's module path
Merge remote-tracking branch 'upstream/master'