Merge "Fix KafkaHandlerTest hack to work with PHPUnit 6"