Merge pull request #8304 from cachedout/#7944

Fix exception when compound matching grains
Merge pull request #8307 from rsommer/patch-1

Use single quotes in cmd string to prevent shell expansion of passwords
Merge pull request #8308 from MTecknology/develop

Added McAfee OS to rh_service
Merge pull request #8309 from shadowfax-chc/emerge-errors

More error reporting in ebuild module
The Salt environment deprecations will last until Salt Boron.
minor pylint fixes
URL environment selection should also be using `saltenv`.
Adds use_wheel option to virtualenv state
Fix the pip unit tests with regards to the latest `saltenv` changes.
Merge pull request #8311 from s0undt3ch/issues/8196-environments

Some more `saltenv` related changes/fixes
Fix pylint errors
Add dir_mode for file.managed

Refs #7860
Updated nodegroups with a few clarifications, updated halite docs with a new section on installing via RPM, when the .deb is done another section needs to be added.
Merge remote-tracking branch 'upstream/develop' into develop
Renamed amazon to aws #6444
Add explanatory in-line comment regarding single vs double quotes for sshpass

It was fixed in 8624b6dcb311635679969392672fb31b272c9581. And since the
Salt coding style is to use single quotes it makes sense to explain in
the code why this needs to be the way it is.
Merge pull request #8315 from scott-w/develop

Initial SQS implementation
Fix typos
Merge pull request #8316 from holmboe/pylint-and-comments

In-line comments and typos
add utf-8 line