Merge pull request #6455 from jacksontj/develop

Fixing a typo ;)
Issue #6427 fix : Added conditional block to grains/core.py to address CentOS boxes that may have custom content within /etc/centos-release
Merge pull request #6452 from tsheibar/issue-6427

Issue #6427 fix : Choose Package Provider on CentOS Boxes with Custom /etc/centos-release Content
Merge pull request #6454 from mafrosis/git_unless_onlyif

Add support for unless/onlyif to git.latest
Use raw strings for proper backslashes.
Merge pull request #6457 from s0undt3ch/hotfix/pylint-anomalous-backslash

Use raw strings for proper backslashes.
apache server-status function
import urllib2 in apache module
Comment out unused import of sys
Convert OrderedDicts inside of lists
Merge pull request #6460 from basepi/ordereddict

Convert OrderedDicts inside of lists
Fix 32-bit binary package installs on 64-bit OS

This fixes #6303. It also forces a change in SLS for apt-based systems,
to avoid a name collision with the 64-bit version of the package. 32-bit
binary packages must now be referred to using pkgname:arch, as they
appear in dpkg --list.
Docstring tweak for pull req #6461
Merge pull request #6461 from terminalmage/issue6303

Fix 32-bit binary package installs on 64-bit OS
Fix extfs module kwarg_map

This fixes #6462. the "kwarg_map" was not taking into account the
"private" kwargs that get passed.
Merge pull request #6463 from terminalmage/issue6462

Fix extfs module kwarg_map
Added unit test for list nested `OrderedDict`'s. Refs #6460.
Simplify `OrderedDict` -> `dict` conversion.
Docmentation tweaks in advance of 0.16.2 release
Merge pull request #6466 from terminalmage/docs

Docmentation tweaks in advance of 0.16.2 release