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

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

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

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

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