Add additional python 2.6 checks
Merge pull request #9289 from techhat/issue9270

Add additional python 2.6 checks
Don't assume that grep-available is available
dockerio state: code-block docstring syntax
Merge pull request #9292 from westurner/dockerio_code_block_yaml

dockerio state: code-block docstring syntax
fix various lint errors in hadoop module
dockerio module: docs syntax and formatting
Exception handling from psutil for processes that go missing.

Refs #9274.
Merge pull request #9293 from hulu/hadoop-fixes

fix various lint errors in hadoop module
Merge pull request #9295 from cachedout/#9274

Exception handling from psutil for processes that go missing.
0.17.3 release notes
Merge pull request #9296 from basepi/0.17.3releasenotes

0.17.3 release notes
Refactor yumpkg5 arch handling

When I originally wrote the mutli-arch support in this module, it was
done hastily and was not well-designed. For instance, it assumes that
x86_64 is the only arch for which packages from other arches are
supported. It additionally doesn't support ARM architectures at all,
making it completely useless on those devices.

This commit handles architectures in a more elegant way. Salt will now
only refer to the package with the arch appended if the arch both A) is
not 'noarch', and B) does not match the 'osarch' grain. This cleans
up the logic significantly, as well as enabling proper support for ARM
devices (though this is still untested).
Fixes pillar namespace merging not preserving order when replacing keys
Remove trailing semicolons from previous commit
Unit testing of ps exec module.

Seemed like this would be sort of mundane but there are actually a few dragons here.
Unit testing turned up the fact that we make use of methods in psutil that are deprecated!
Lint.
Compensate for time spent waiting for events
Merge pull request #9303 from cachedout/ps-unit-tests

Ps unit tests
Merge pull request #9298 from terminalmage/refactor-yumpkg-multiarch

Refactor yumpkg5 arch handling