Feature/zookeeper upgrades