SENSEI-320

This resolves conflicts with newer versions of Kafka.

https://senseidb.atlassian.net/browse/SENSEI-320