Update zookeeper / curator etc

Noting that the previous attempt was reverted for performance reasons,
this is a new attempt at this. Hopefully we will be able to track down
the performance regression.

I am more that willing to work through performance gotchas here, so this doesnt have to be merged immediately.