Fix up some merges where we wanted the upstream version.
re #13879 make libsqlite a real shared lib (tweaks)
  Fix rebuild after pull (remove files left in the way)
  Make sqlite.h SQLITE_VERSION more predictable.
OS-5 Integrate virtio drivers
    integration cleanup (copyrights, cddl 1.0)
port of illumos-1562
    1562 Integrate the virtio core module
    Reviewed by: Dmitry Yusupov <Dmitry.Yusupov@nexenta.com>
    Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
    Approved by: Garrett D'Amore <garrett@damore.org>

*** 18,28 ****
  #
  # CDDL HEADER END
  #
  
  #
! # Copyright (c) 2012 Nexenta Systems, Inc. All rights reserved.
  #
  
  #
  # The default for payload-bearing actions in this package is to appear in the
  # global zone only.  See the include file for greater detail, as well as
--- 18,28 ----
  #
  # CDDL HEADER END
  #
  
  #
! # Copyright 2012 Nexenta Systems, Inc.  All rights reserved.
  #
  
  #
  # The default for payload-bearing actions in this package is to appear in the
  # global zone only.  See the include file for greater detail, as well as