Merged SSH1 robustness changes from 0.55 release branch on to trunk.