Refreshed feature-zap-cursor-to-key to handle new context

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

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

diff --cc zfs/lib/libzpool/zap.c
Simple merge

diff --cc zfs/lib/libzpool/zap_micro.c
Simple merge