use old ssh code until higebu's branch is ready, see #1019
Merge branch 'use-old-ssh-until-higebus-branch-is-ready' into integration