Merge pull request #9338 from terminalmage/issue9232

Suppress tracebacks in states which manage files
Add avail_locations() to nova driver
Merge pull request #9349 from techhat/nova

Add avail_locations() to nova driver
updated rabbitmqctl policy commands to support latest version
Merge remote branch 'upstream/develop' into develop
updated globbing docs with an extra example
Merge pull request #9352 from gravyboat/develop

Updated targeting docs and prepared FAQ for some new pages.
Merge pull request #9291 from jesusaurus/grep/available

Don't assume that grep-available is available
Starting on unit tests for docker and salt.utils.
Merge pull request #9299 from vahidden/develop

Fixes pillar namespace merging not preserving order when replacing keys
Merge pull request #9305 from s0undt3ch/hotfix/missing-exsel-keyerror-2

`exsel` matching is no longer supported
Merge pull request #9309 from terminalmage/issue9234

Improve reporting for errors caching binary packages
Merge pull request #9329 from terminalmage/issue9061

Allow '_in' requisites to match both on ID and name
Merge pull request #9337 from tkwilliams/salt-thin-fixes

Initial working code to support specifying additional modules to include into a thin.tgz (think mako :)
Merge pull request #9347 from terminalmage/issue9158

Display templating error in cmd.script states
Merge pull request #9336 from thematthopkins/windows_install_flags

Fix for windows installs without extra_install_args
Merge pull request #9307 from olliewalsh/client_timeouts

Fix client timeout issues
Merge pull request #9351 from beichhor/bug/rabbitmqctl

Updated rabbitmqctl set_policy command to support latest version
Update RPM spec for 0.17.4
Merge pull request #9355 from terminalmage/packaging

Update RPM spec for 0.17.4