rename the parameter in salt-key also, otherwise it will never rotate the key
Merge pull request #15928 from basepi/grainsdocs

Match case for argument documentation
Add check for correct arg passing in salt-ssh
Fix indentation errors and inconsistencies

Documentation for new requirements did not consistently use two spaces for
indentation or even no indentation at all.
The stderr may include information about keys as well
Call for a re-deploy if the salt-call file is not there
Re-deploy if we get an undefined shim error, Fix #9522
Merge pull request #15917 from felskrone/fix_key_rotation

Rename key_no_rotate to rotate_aes_key
Merge pull request #15927 from UtahDave/2014.7local

remove problematic expect fork
Merge pull request #15930 from thatch45/add_ssh_debug_data

Add the unclean data to the output
Merge pull request #15929 from thatch45/ssh_version_in

Add ssh version checking to salt-ssh
Merge pull request #15934 from thatch45/ssh_flush_vt

Make sure to flush the vt term
Merge pull request #15936 from thatch45/safe_args_ssh

Add check for correct arg passing in salt-ssh
Merge pull request #15937 from thatch45/better_ssh_passwd_detect

Add better check for password auth requests
Merge pull request #15940 from thatch45/ssh_bad_deploy

Fix bad deployment of the thin automatically
Change timeout for CLI returns

This is a fix for #15905, the intent being that if you set a timeout it will actually time out. If you pass/set a timeout of 0 it will do the checking of minions etc to determine if the job is running. This seems to be a better compromise since the user/admin can decide wether to have timeouts or not
Make the error on passwords float up to the key_deploy catch
Add CLI timeout tests to standard client tests
Merge pull request #15943 from thatch45/passwd_error_detect

Make the error on passwords float up to the key_deploy catch
Add tests for timeouts to client tests. In addition this makes all of the client functions have the same functionality