XD-1410 Add Zookeeper support