[bot] Merge 24.11 to develop (Conflicts)

[github-actions[bot]]

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

git fetch
git checkout fb_bot_merge_24.11
git reset --hard origin/develop
git merge 7aceebb5e7186317c37b2b2d0a2897916adfd8b7 -m "Merge 24.11 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.11