OS-1282 smartos' OpenSSH "KeepAlive" config var differs from "TCPKeepAlive" name in current OpenSSH

*** 11,20 ****
--- 11,21 ----
   * called by a name other than "ssh" or "Secure Shell".
   */
  /*
   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
+  * Copyright 2012 Joyent, Inc.  All rights reserved.
   */
  
  #include "includes.h"
  RCSID("$OpenBSD: readconf.c,v 1.100 2002/06/19 00:27:55 deraadt Exp $");
  
*** 202,212 ****
          { "batchmode", oBatchMode },
          { "checkhostip", oCheckHostIP },
          { "stricthostkeychecking", oStrictHostKeyChecking },
          { "compression", oCompression },
          { "compressionlevel", oCompressionLevel },
!         { "keepalive", oKeepAlives },
          { "numberofpasswordprompts", oNumberOfPasswordPrompts },
          { "loglevel", oLogLevel },
          { "dynamicforward", oDynamicForward },
          { "preferredauthentications", oPreferredAuthentications },
          { "hostkeyalgorithms", oHostKeyAlgorithms },
--- 203,214 ----
          { "batchmode", oBatchMode },
          { "checkhostip", oCheckHostIP },
          { "stricthostkeychecking", oStrictHostKeyChecking },
          { "compression", oCompression },
          { "compressionlevel", oCompressionLevel },
!         { "tcpkeepalive", oKeepAlives },
!         { "keepalive", oKeepAlives },                           /* obsolete */
          { "numberofpasswordprompts", oNumberOfPasswordPrompts },
          { "loglevel", oLogLevel },
          { "dynamicforward", oDynamicForward },
          { "preferredauthentications", oPreferredAuthentications },
          { "hostkeyalgorithms", oHostKeyAlgorithms },