Merge "KafkaLiveLockAvoider2.java: fixed sonar issues"