[bot] Merge 25.11 to 26.2 (Conflicts)

[github-actions]

Automatic merge failed! Please merge 25.11 into 26.2_fb_bot_merge_25.11 and resolve conflicts manually.

git fetch
git checkout 26.2_fb_bot_merge_25.11
git reset --hard origin/release26.2-SNAPSHOT
git merge 8d961f012d5ecc241ccf93e4390d26d1a9284b83 -m "Merge 25.11 to 26.2"

Resolve all conflicts (using IntelliJ or git mergetool)

git commit
git push --force

Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=26.2_fb_bot_merge_25.11