equivalenceUpdatingMessageListener is an Optional<KafkaConsumer>
Merge branch 'kafka' into stage

* kafka:
  equivalenceUpdatingMessageListener is an Optional<KafkaConsumer>