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
Fixing the doc and escaping newline char
Merge pull request #13675 from nmadhok/fix-doc-states-file

Fixing the doc for salt.states.file - Fixes #13674
Do not unnecessarily recompile OpenVZ envId pattern

The pattern against which lines in /proc/self/status are matched is static and
therefore does not have to be (re-)compiled for every line in the file.
More cloud config unit tests
linting fix
Merge pull request #13678 from rallytime/cloud_config_tests

More cloud config unit tests
Merge pull request #13676 from basepi/cherrypick

Do not unnecessarily recompile OpenVZ envId pattern
Adding state docstring to the state_doc function output.
Make salt-key create the right key dirs
Here you go @mgwilliams, I have not tested this!!

But it should not cause any problems, please test it and fix it up!
Genericize key generation for raet/zeromq
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