Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

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

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