SSH: merge upstream sshd_config changes