[bot] Merge 25.3 to 25.5 (Conflicts)

[github-actions]

Automatic merge failed! Please merge 25.3 into 25.5_fb_bot_merge_25.3 and resolve conflicts manually.

git fetch
git checkout 25.5_fb_bot_merge_25.3
git reset --hard origin/release25.5-SNAPSHOT
git merge 7ed75225e5f05f20f06fa5485d4cc8b8b9ff60ea -m "Merge 25.3 to 25.5"

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.5_fb_bot_merge_25.3