Fix for custom port in sync strategy #377

#377

<!---
@huboard:{"order":382.0,"milestone_order":382,"custom_state":""}
-->

Can't we always use the `-e 'ssh ..'` version, just omitting the when not passed? Should make the code cleaner