Zookeeper: Yosemite fixes

Closes #32900.
Also needs fixed.