Switch LocalClient().cmd() to watch returns same as Salt's CLI
Revert "Add master local ip mapping to minion id checking"

This reverts commit 1f890ea9592e6237b831306a4376a19dec8fb682.

Fixes #13665

Conflicts:
	salt/utils/minions.py
Adding state docstring to the state_doc function output.
copy and rename should pass name instead of dname when makedirs is true
Merge pull request #13682 from Tweenagedream/states-file-rename-copy-makedirs-fix

copy and rename should pass name instead of dname when makedirs is true
chmod ssh known hosts file
Fix key gen, earlier commit reffed wrong gen_keys method
fix ext_nodes breakage
libnacl settled on taking a path in the new save method of keys
Fix typo
Since #13463 support for previous version of docker-py older than 0.3.2 is broken

Reflect this change in documentation
docker-py==0.3.2 already reads '~/.dockercfg'

So drop its support

Fixes #13305
Fix digital ocean provider integration tests
Merge pull request #13688 from rallytime/digitalocean_tests

Fix digital ocean provider integration tests
Update "Getting Started with Digital Ocean" docs to include ssh requirements
docker api > 1.9
Migrate minion to centralized exit codes
fix misspelling
fix bugs in highstate whitelist, add tests
Merge pull request #13693 from mgwilliams/highstate-whitelist

fix bugs in highstate whitelist, add tests