Zookeeper: Upstream Patches

Latest upstream patches for zookeeper.

These patches are necessary to fix compile issues for other software running on 10.10 hooking into Zookeeper; once this is merged I’ll push the fix for #32965.