Replace getpass.getuser()
Test fix for #11717

Conflicts:
	salt/state.py
fixing bug in rabbitmq state
Put the SSH defaults in config.py and use them.

Fixes #10604

Conflicts:
	salt/config.py
make sure top.sls is evaluated in order
Fix --list all option
fixing win_servermanager install/remove function
Yay systemd.daemon.notify

requires the python2 systemd bindings
Don't use tokens if euid = 0
If a token is present, first attempt to use .root_key to auth.

Fallback to token if that fails.
Stop passing **kwargs to find_job
Stop passing **kwargs to find_job
Don't cast the present minions in a list
fix saltenv for aptpkg.mod_repo from pkgrepo state

so that when key_url=salt://gpg.key, salt will get gpg.key from the correct
environment instead of the 'base' environment.

Conflicts:
	salt/states/pkgrepo.py
Update error message for `cmd.script` on cache fail to use saltenv

Conflicts:
	salt/states/cmd.py
Do not rely solely on cached filelisting for sls
Fix bug in _parse_key

According to the documentation, we should have double backslashes between the path segments in the key, however _parse_key split and joined on a single backslash which caused the resulting path to start and end with a backslash.
Make git rev-parse check fail if SHA not found

This reinstates the change in 51d18a495e68b1812a58e3a2f03eeee1cfc34bf5.

That change was first broken by 091a5515fefc6ba69be2507aaace5e5d685a1618
(by introducing a space, which breaks the `<rev>^{<type>}` syntax being
used, see `git rev-parse` documentation) ... and then fully removed by
ef48008bbc7e641edb2f4f304f749d5378c3de2e. The commit message in the
latter commit does not suggest an intent or a reason to revert the
51d18a495e68b1812a58e3a2f03eeee1cfc34bf5 change, so it was probably just
trying to resolve the immediate problem that the git rev-parse call was
broken.

Conflicts:
	salt/states/git.py
Add minion auth retry on rejection
Fix #11493

crypt.dropfile was failing to emplace the .dfn file
when user was None, as is the case in the periodic
call based on the publish_session config setting.