Autosetup fix to support non-default ssh port on upstream
Autosetup fix to support non-default ssh port on upstream

zero-os/0-orchestrator,zero-os/0-orchestrator,zero-os/0-orchestrator,zero-os/0-orchestrator