Merge branch 'fix-branch' into refs/top-bases/zfs-branch

diff --cc module/zfs/dmu.c
Simple merge

diff --cc module/zfs/include/sys/dmu.h
Simple merge

diff --cc module/zfs/lzjb.c
Simple merge

diff --cc module/zfs/metaslab.c
Simple merge

diff --cc module/zfs/vdev_raidz.c
Simple merge