Zookeeper: Yosemite fixes

Closes #32900.
I'm not sure. Upstream have tagged this issue as ``` patch available ``` rather than ``` patch accepted ``` or such, so I threw it in to fix the ``` --HEAD ``` build till the patch has been merged. I'm happy to leave it out though, if desired.