Merge remote-tracking branch 'remotes/illumos-ml/master' into titanic

3701 Chelsio Terminator 4 NIC driver for illumos
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Dan McDonald <danmcd@nexenta.com>