[bot] Merge 24.7 to develop (Conflicts)

[github-actions]

Automatic merge failed! Please merge 24.7 into fb_bot_merge_24.7 and resolve conflicts manually.

git fetch
git checkout fb_bot_merge_24.7
git reset --hard origin/develop
git merge 420c6f5da958712ee9accd25b5b848f13f8a4466 -m "Merge 24.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_24.7