[bot] Merge 24.11 to 25.2 (Conflicts)

[github-actions]

Automatic merge failed! Please merge 24.11 into 25.2_fb_bot_merge_24.11 and resolve conflicts manually.

git fetch
git checkout 25.2_fb_bot_merge_24.11
git reset --hard origin/release25.2-SNAPSHOT
git merge 4084887abf4e998c0a1f14e747a0a9b9ae57c79f -m "Merge 24.11 to 25.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=25.2_fb_bot_merge_24.11