Merge pull request #4740 from hulu/conditionals-state.py

simplify / style-tweak conditionals in state.py
Merge pull request #4741 from hulu/conditionals-file-state

simplify / style-tweak conditionals in file state
Merge pull request #4742 from hulu/conds-client-overstate-key

simplify/style-tweak/refactor conditionals in client, overstate, key
Merge pull request #4743 from hulu/conditionals-__init__s

simplify / style-tweak conditionals in __init__.py-s
Merge pull request #4744 from hulu/conditionals-arbitrary-chunk

simplify/style-tweak/refactor conditionals in states.user,modules.{apt,file}
Merge pull request #4745 from hulu/conditionals-long-tail

simplify/style-tweak/refactor rest of the conditionals
Merge pull request #4746 from cvrebert/patch-1

compare st_mode as integer; rm unnecessary string conversion
Merge pull request #4749 from geops/git_stash_and_reset

add new git commands: reset and stash
Merge pull request #4750 from webwurst/patch-1

Adjust some documentation of parted.py
Fix symlink recursion in salt.utils.safe_walk
Merge pull request #4751 from millerdev/safe-walk

Fix symlink recursion in salt.utils.safe_walk
Use safe_walk in salt.util.list_files
Make module refresh work based on the event bus
Tighten up the loop_interval since we are not hitting

the file system all the time anymore
Change module sync to use the new event based refresh
Merge pull request #4752 from millerdev/safe-walk

Use safe_walk in salt.util.list_files
Fix accidental spelling regression
stateconf.statelist(): make default argument value immutable
Kill a bad raise statement, fix #4754
Merge pull request #4753 from cvrebert/patch-1

stateconf.statelist(): make default argument value immutable