Zookeeper: Yosemite fixes

Closes #32900.
I thought Mike's preference on this had been merged already. Apologies if it hasn't been.