Zookeeper and redis-server related to change to sync with mainline