Merge remote-tracking branch 'illumos-ml/master' into titanicSome zev merge conflicts fixed.Conflicts: usr/src/uts/common/fs/zfs/zfs_ioctl.c usr/src/uts/common/fs/zfs/zvol.c
3915 Add adjuncts support to the buildReviewed by: Robert Mustacchi <rm@joyent.com>Reviewed by: Richard Lowe <richlowe@richlowe.net>Approved by: Dan McDonald <danmcd@nexenta.com>
OpenSolaris Launch