Updating kafka module to master

Change-Id: Ifeab8c3306a90404c9dc11ffd3dacbca65e597d2