simplify / style-tweak conditionals in state.py
simplify / style-tweak conditionals in file state
simplify/style-tweak/refactor conditionals in client, overstate, key
simplify / style-tweak conditionals in __init__.py-s
simplify/style-tweak/refactor conditionals in states.user, modules.{apt,file}
simplify/style-tweak/refactor rest of the conditionals
compare st_mode as integer; rm unnecessary string conversion

Per https://github.com/saltstack/salt/pull/4738#discussion_r4050234
refactor to avoid temp var in xmlutil.to_dict()
fix typo and make git.rm actually call "git rm"
Merge pull request #4748 from geops/git_rm_call_rm

fix typo and make git.rm actually call "git rm"
Merge pull request #4747 from hulu/

trivial refactor to avoid temp var in xmlutil.to_dict()
new git commands: reset and stash
Adjust some documentation
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