Change how salt-ssh connects with sshpass.

When the 'passwd' option is set in the rooster file for a host, then salt won't use PubkeyAuthentication even if it is already set up.
Merge pull request #15135 from saltstack/fp-15078

Forward-port #15078 to 2014.7
Merge branch '2014.7' into develop