Merge remote-tracking branch 'upstream/develop' into develop
Fix windows.

modules/win_pkg.py:
locale.get_locale() doesn't exists. locale.getlocale() does but returns (None, None) on windows. locale.getpreferredencoding() appears to be correct.

modules/win_file.py:
_is_bin appears to have been removed form modules/file.py
Merge remote-tracking branch 'upstream/develop' into develop
Add some comments on yaml arg parsing per #5483
Add timeout to salt.state.cmd.* functions

Add ability to specify timeouts for arbitrary commands.
If timeout is reached, subprocess is sent sigterm, and later sigkill
if it still exists. Issue #5322
Update file.py

add function for creating symlink
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