Add `sftp_file` function and prefer it over `scp_file`
Two spaces before in-line comment
Use the SSH option for port and not the CLI flag
Merge pull request #15574 from s0undt3ch/2014.7

[2014.7] Add `sftp_file` function and prefer it over `scp_file`
Merge remote-tracking branch 'salt/2014.7' into develop

Conflicts:
	salt/utils/cloud.py