Trunk patch
Merge branch 'kafka-channel-uuid-consumer' into kafka-channel-submitted-to-trunk

Conflicts:
	flume-ng-channels/flume-kafka-channel/run-kafkatest
Merge branch 'kafka-channel-uuid-consumer' into kafka-channel-submitted-to-trunk