Zookeeper: Upstream Patches

Latest upstream patches for zookeeper.

Once this is merged I’ll push the fix for #32965.
zookeeper: update 3.4.6_1 bottle.