merged Kafka fixes from swing_ui development branch
Merge branch 'develop' into scala_2.11

* develop:
  merged Kafka fixes from swing_ui development branch