sshd: merge in upstream changes