[bot] Merge 24.3 to 24.7 (Conflicts)

[github-actions]

Automatic merge failed! Please merge 24.3 into 24.7_fb_bot_merge_24.3 and resolve conflicts manually.

git fetch
git checkout 24.7_fb_bot_merge_24.3
git reset --hard origin/release24.7-SNAPSHOT
git merge 2008c6b5e61b22b47cd9389527487e8a28b99a90 -m "Merge 24.3 to 24.7"

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=24.7_fb_bot_merge_24.3