Merge "Revert "SSHD: Prevent double authentication for the same public key"" into stable-2.10