Upgrade zookeeper to 3.4.6
Fix the broken build after the upgrade to protobuf 2.5