Merge "Fix checkstyle warnings in logback-config"