Changes to support Kafka 0.8.1.1 release