Merge "Add port parameter to ssh Client"