Merge with ssh default port from rainerfrey

Merge rainerfrey's contribution (the only outstanding contribution with test coverage) into mine and resolve conflicts.  Evidently everyone's tweaks all touch the same line: the one with the rsync command.