Merge pull request #5097 from hulu/debian-packaging-shebang

/usr/bin/env python -> /usr/bin/python in scripts
Merge pull request #5099 from virtua-network/smartos_features

grains/core : add useful information from SmartOS zone
Merge pull request #5103 from cvrebert/patch-1

pkgin mod: rm unused import of the os module
Merge pull request #5104 from cvrebert/patch-2

runners.manage: rm unused import of shutil
have pylint ignore __env__ too
fix spelling
Merge pull request #5106 from cvrebert/patch-3

have pylint ignore __env__ too
include_config -> configuration, to avoid shadowing same-named func
Merge pull request #5111 from hulu/config-shadowing

include_config -> configuration, to avoid shadowing same-named func
Merge pull request #5107 from cvrebert/patch-4

fix spelling
rm unused salt.utils import from openbsdpkg module
State.order_chunks(): sort only once instead of twice
safe_walk: stat -> status, to avoid shadowing the imported 'stat' module
file state: comment -> comment_, to avoid shadowing outer func
rename running -> runnings to avoid shadowing; use comprehension
Merge pull request #5122 from cvrebert/patch-2

rm unused salt.utils import from openbsdpkg module
Add options parameter to brew module.

Adds additional support for the many brew packages that can be installed with options. Brew itself however does not handle the reinstall process if you want to change the options after install. Brew currently forces you to do an uninstall followed by a install.

I imagine that we could automate the updating of options as the `brew info <pkg name>` command does contain info about what the last install options were. However parsing that and comparing to the state options is a bit much for me to take on right now.
Merge pull request #5125 from hulu/avoid-double-sort

State.order_chunks(): sort only once instead of twice
Merge pull request #5126 from hulu/stat-shadowing

safe_walk: stat -> status, to avoid shadowing the imported 'stat' module
Merge pull request #5127 from hulu/file-comment-shadowing

file state: comment => comment_, to avoid shadowing outer func