Zookeeper: Yosemite fixes

Closes #32900.
No harm I guess if the patch is already there.