Added support for custom SSH ports

Custom SSH ports are supported on remote datasources with the
“ssh_port” declaration.
Updates to add Default Port of 22
Fix merge conflicts. Integrate ssh port update whilst preserving recent changes to SSH.