Merge change 11206

* change 11206:
  Do not invoke ssh with -p argument when no port has been specified.