Merge "Add dependency on zookeeper for kafka"