Revert "Merge branch 'mruzicka-ticket/master/14872-PMT-respect-environments'"

This reverts commit 832dc76fe7305e3efebd4220498ad0353fbf8ab8, reversing
changes made to 7490e18b915b50f7ee0204332d5dad20408cc8f1.
Update PUPPETVERSION to 3.1.0-rc1
Merge branch 'fix/master/14872_revert_pmt_modulepath'

* fix/master/14872_revert_pmt_modulepath:
  Revert "Merge branch 'mruzicka-ticket/master/14872-PMT-respect-environments'"
Merge branch 'release/3.1.x/3.1.0-rc1'
(#17716) HPUX_user_provider
Updated to allow user provider to manage passwords on hpux in either
normal or trusted computing modes. Updated spec file to make sure
changes are in place. Specifically manages_passwords, user exists and
password function returns a password.
(#17716) Improve the provider spec tests for hpux password management

Without this patch the behavior tests for the HPUX user provider are
failing with this error:

    Failures:
      1) Puppet::Type::User::ProviderHpuxuseradd should return password entry if exists
         Failure/Error: @provider.password.should be_true
           expected: true value
                got: nil
         # ./spec/unit/provider/user/hpux_spec.rb:43:in `block (2 levels) in <top (required)>'

This patch fixes the problem by updating the spec tests to stub only when
necessary.
(maint) Re-indent the HPUX user provider file

Without this patch the hpux user provider uses 4 space soft tabs.  This
patch re-formats the file to our 2 space soft tab standard.
Merge branch 'jjperry69-17716/master/17716_HPUX_user_provider'

* jjperry69-17716/master/17716_HPUX_user_provider:
  (maint) Re-indent the HPUX user provider file
  (#17716) Improve the provider spec tests for hpux password management
  (#17716) HPUX_user_provider Updated to allow user provider to manage passwords on hpux in either normal or trusted computing modes. Updated spec file to make sure changes are in place. Specifically manages_passwords, user exists and password function returns a password.
(#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).