Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

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

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

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

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

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

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

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