SSHD-356 Backport SSHD-330 Handshake fails (wrong shared secret) to 0.9 release