Upgrade to zookeeper 3.6.3 (#2219)