master
[JAVA-25150] Logback upgrade (#16288)
BAEL-6312 Update @JsonMerge annotation test to update language instead of name