Fixes change in Kafka consumer input plugin (#2222)

* Fixes change to the error api in the kafka project.

* Updated test to reflect the change.

* Update kafka to match master branch.

plugins/inputs/kafka_consumer/kafka_consumer.go

@@ -33,7 +33,7 @@ type Kafka struct {
 	// channel for all incoming kafka messages
 	in <-chan *sarama.ConsumerMessage
 	// channel for all kafka consumer errors
-	errs <-chan *sarama.ConsumerError
+	errs <-chan error
 	done chan struct{}
 
 	// keep the accumulator internally:

plugins/inputs/kafka_consumer/kafka_consumer_test.go

@@ -27,7 +27,7 @@ func newTestKafka() (*Kafka, chan *sarama.ConsumerMessage) {
 		Offset:          "oldest",
 		in:              in,
 		doNotCommitMsgs: true,
-		errs:            make(chan *sarama.ConsumerError, 1000),
+		errs:            make(chan error, 1000),
 		done:            make(chan struct{}),
 	}
 	return &k, in