Add two options in the salt-ssh documentation
Merge pull request #10200 from bogdanr/develop

Add two options in the salt-ssh documentation
Merge branch 'develop' of https://github.com/saltstack/salt into randomize_master_selection
Fix pylint failures