[bot] Merge 25.7 to develop (Conflicts)

[github-actions]

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

git fetch
git checkout fb_bot_merge_25.7
git reset --hard origin/develop
git merge ed1bc835a6120135ee0cabb2a697daad5e0cc88f -m "Merge 25.7 to develop"

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=fb_bot_merge_25.7