[MERGE] Fix bug 146715: bzr+ssh:// and sftp:// transports should not assume port-not-specified means port 22

[Andrew Bennetts]

Martin Pool wrote:
> Please go ahead and merge it, but file a bug complaining about the
> inconsistency.

Filed as <https://launchpad.net/bugs/150860>.

-Andrew.