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
2408 CJK character width handled incorrectly in terminal emulators (missing widths-2.txt)