[bot] Merge 25.3 to 25.6 (Conflicts)

[github-actions]

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

git fetch
git checkout 25.6_fb_bot_merge_25.3
git reset --hard origin/release25.6-SNAPSHOT
git merge 9ab5164f6a56a3b1cf19ba5d4de7d6ef01d05da8 -m "Merge 25.3 to 25.6"

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