INTEXT-44: Consumer context, cleanup for Kafka adapters