Zookeeper: Yosemite fixes

Closes #32900.
Similarly, only needed on Yosemite.