[bot] Merge 25.7 to 25.11 (Conflicts)

[github-actions]

Automatic merge failed! Please merge 25.7 into 25.11_fb_bot_merge_25.7 and resolve conflicts manually.

git fetch
git checkout 25.11_fb_bot_merge_25.7
git reset --hard origin/release25.11-SNAPSHOT
git merge e2daa6bbcad1fe0ee0e4c34e6b41e62939c38ee8 -m "Merge 25.7 to 25.11"

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=25.11_fb_bot_merge_25.7