Merge "Align logback configuration"