Update

This is a merge between the master branch of the Giwi/camel-kafka and the master branch of the ReturnPath/camel-kafka. Some updates had occurred in the Giwi repo since the ReturnPath fork.