6655613 resync server's conditional Match block from OpenSSH (fix lint)
6655613 resync server's conditional Match block from OpenSSH