Zookeeper: Yosemite fixes

Closes #32900.
Only needed on Yosemite though, right?