Sergey Matvienko
11a8e5c7eb
Merge remote-tracking branch 'ce/master' into feature/kafka-consumer-group-per-partition
# Conflicts:
# application/src/main/java/org/thingsboard/server/service/queue/ruleengine/TbQueueConsumerTask.java
# application/src/main/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineQueueConsumerManager.java
# application/src/test/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineQueueConsumerManagerTest.java
# common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaAdmin.java