Two changes

* cmd ssh and local made consistent, and ssh is cleaned up a bit

* orchestrator waiting time 60s => 90s