Zookeeper: Yosemite fixes

Closes #32900.
but nest them all inside one if