Refactoring the cluster factory
Merge branch 'develop' of https://github.com/continentals/kafka-xenon into develop