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

Some zev merge conflicts fixed.

Conflicts:
usr/src/uts/common/fs/zfs/zfs_ioctl.c
usr/src/uts/common/fs/zfs/zvol.c

3882 Remove xmod & friends
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Richard Lowe <richlowe@richlowe.net>

OpenSolaris Launch