MFC r249489,249555

  Run configtest before restarting so that the system is not
  left without a running sshd.

  Also call configtest before reload to ensure working config.