[bot] Merge 25.7 to 25.11 (Conflicts)#1251

Merged

github-actions[bot] merged 2 commits intorelease25.11-SNAPSHOTfrom

25.11_fb_bot_merge_25.7

Jan 6, 2026

Commits on Jan 2, 2026

Update log4j2 to the latest version (#1248)
labkey-adam
authored

Commits on Jan 5, 2026

Merge 25.7 to 25.11
labkey-klum
committed