Add workaround for SSH connection issue related to SSHD-1028