Zookeeper: Yosemite fixes

Closes #32900.
probably best not to change this until we have a deprecation mechanism like #32474