Reverting wait_for_ssh command

scp and ssh commands now wait for SSH to come online, like they were before.

As we discussed in IRC (and can be seen in the commit message), if the user aborted with Ctrl+C, report what we are doing so that the operator error can be discovered more efficiently.