Zookeeper: Yosemite fixes

Closes #32900.
Is it worth patching HEAD builds? This will be stale pretty soon.