Merge "Fix sonar issues in KafkaConsumerCache.java"