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

diff --cc cmd/ztest/ztest.c
Simple merge

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

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