Merge "Re-implement Kafka tests that periodically fail"