Merge pull request #5485 from jamesalbert/patch-1

Update file.py
 Ignoring multiple spaces or tabs, while checking for sysctl changes.
Merge pull request #5487 from mlister2006/develop

 Ignoring multiple spaces or tabs, while checking for sysctl changes.
Merge branch 'timeout-for-run-command' of git://github.com/hulu/salt into hulu-timeout-for-run-command

Conflicts:
	salt/states/cmd.py
Update eventlisten script with sock_dir changes
Doh! node
Check include/exclude in file.recurse include_empty, Fix #2747

With `include_empty: True`, `file.recurse` was completely ignoring
include/exclude patterns with regards to directories.
Merge pull request #5482 from olliewalsh/fix_win_pkg

Fix windows
Merge pull request #5489 from basepi/recurse2747

Check include/exclude in file.recurse include_empty, Fix #2747
make it more obvious that salt runners execute on the master
pep8 whitespace fixes
Merge pull request #5493 from hulu/whitespace-fixes

batch of pep8 whitespace fixes
Merge pull request #5490 from illumin-us-r3v0lution/patch-1

make it more obvious that salt runners execute on the master
Fix stack trace in win_file virtual function
Merge remote-tracking branch 'upstream/develop' into develop
glsa-check can work also with empty glsa list
to avoid problem I think that would be better to delete old temp files every time revdep-rebuild runs
I think that would be better to use a portage API function than a custom one. This way we can handle also DEPEND atom and not only cpv.
better error handling for portage_config.py state module
Merge remote-tracking branch 'upstream/develop' into gentoo_fixes