[bot] Merge 23.7 to 23.11 (Conflicts)

[github-actions]

Automatic merge failed! Please merge 23.7 into 23.11_fb_bot_merge_23.7 and resolve conflicts manually.

git fetch
git checkout 23.11_fb_bot_merge_23.7
git reset --hard origin/release23.11-SNAPSHOT
git merge 3c582999d8343f2c94e5bc24479241ba293a2429 -m "Merge 23.7 to 23.11"

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=23.11_fb_bot_merge_23.7