(maint) Windows failing spec fixes

 - The usage of Dir.getwd in tests has been simplified to
   File.expand_path to properly handle mixed case CWD
 - util_spec.rb ensures 'FOO' Env var cleared before test starts
 - Windows SID checks should be performed as a regex match to
    properly handle all accounts starting with S-1-5-*, which denotes
    accounts with an identifier authority of SECURITY_NT_AUTHORITY
    instead of hardcoding S-1-5-32-544, the Administrators group
(#22608) Restore the ability for master to accept pson file backups

Commit 769dcdf for #22375 removed the ability for newer masters to
accept pson encoded file backups from older agents.

This commit ensures that masters can deserialize `s` or `pson` encoded file
backups, while agents will serialize using `s` by default.

It also restores the ability to serialize to pson, but adds a
deprecation warning if that happens. Since pson is not the
`default_format` the agent will never serialize file bucket files to
pson.
Merge pull request #1919 from joshcooper/ticket/stable/22608-accept-pson-file-backups

(#22608) Accept pson file backups
(Maint) Fix typo in method name

Acceptance test was failing trying to call confine_block, which doesn't
exist, need to call confine instead.
(packaging) Update PUPPETVERSION for 3.3.1-rc1
(maint) rename urpmi spec to be run by default
(#22652) Parse query strings in rack w/o rack

Rack does not actually support parsing multiple valued query strings
into an array of values (see https://github.com/rack/rack/pull/519).
This is not going to be supported before rack 2.0, but we need this
behavior in order to not have to deal with YAML query parameters.

This changes the rack based query parameter parsing to use CGI.parse
instead of the built in rack semantics (which also has a large number of
other semantics, which we weren't using). As a note, it does not appear
that the behavior of rack's query parameter parsing is documented
anywhere.
(#22652) Restore rack parsing of POST body parameters

The first pass at the fix for #22652 fixed ignore handling by fixing
support for multi-valued parameters in a GET query_string (i.e. by returning
them as an array); however, it inadvertently broke parsing of parameters
in a POST body, e.g. as found in the catalog endpoint POST.

This patch addresses parameters in either case.  As a footnote however,
note that multi-valued parameters in a POST body (which we don't use) would not
return them as an array.

This patch also adds two specs tests, one to catch the issue in the first pass fix
(POST parameters not parsed), and one to flag the state of POST multi-valued param
parsing (does not return array).
(#22652) Add be_one_of matcher (copped from pcarlisle)
(#22652) Tighten up spec for multi-valued params in a POST body
Merge pull request #1946 from kylog/ticket/stable/22652-multi-valued-param

(#22652) multi valued parameter support for rack
(packaging) Update PUPPETVERSION for 3.3.1-rc2
Merge pull request #1939 from adrienthebo/maint-rename_urpmi_spec

(maint) rename urpmi spec to be run by default
Revert "Merge pull request #1939 from adrienthebo/maint-rename_urpmi_spec"

This reverts commit a168defc0e2f50ad3011de2178771f2b876ba1ea, reversing
changes made to 891fce7bcefb59ff6082d2b234f3078ac1df9158.
(#22529) Handle no package message for different dpkg-query versions

dpkg-query changes it's notification of missing package between versions
1.15 and 1.16.  We were testing for the earlier variant 'No packages
found matching'.  This change also handles the later variant of
'dpkg-query: no packages found matching'.

Also, sigh.
Merge pull request #1960 from jpartlow/issue/stable/22529_package_query_should_not_warn_for_later_versions_of_dpkg_query

(#22529) Handle no package message for different dpkg-query versions
(maint) Test of resource package does-not-exist checks stderr

The acceptance test validated stdout, but did not validate absence of
errors logged on stderr.  This fixes that.
(packaging) Update PUPPETVERSION for 3.3.1-rc3
Merge branch 'fix/stable/windows-spec-fixes' of git://github.com/Iristyle/puppet into stable

* 'fix/stable/windows-spec-fixes' of git://github.com/Iristyle/puppet:
  (maint) Windows failing spec fixes