Merge "Fix logback-config warnings"