Zookeeper: Yosemite fixes

Closes #32900.