Merge pull request #7208 from terminalmage/issue7206

Remove unused kwargs from restart/reload functions
deprecate 'repo' arg to modules.apt.latest_version()
make sure addr is a string
rm trailing whitespace from master.py
Add ssh-copy-id routines to shell
Allow for ssh-copy-id to be used
rm trailing whitespace
Merge pull request #7220 from hulu/trailing-whitespace

rm trailing whitespace
Merge pull request #7219 from hulu/trailing-whitespace-master

rm trailing whitespace from master.py
pull stdout and stderr from cmd_block
store addr as a list in scan roster
if running in local mode fail cleanly on event calls
clean out unused imports
always run with file_client local
Add minion opts to minion
Set up data correctly for the highstate outputter
ssh client does not need the salt user
Fill out ssh top level client systems
Handle deploy seq inline of base routine in salt-ssh
Merge pull request #7183 from dlanderson/fix_issue_6785

Fix https://github.com/saltstack/salt/issues/6785