[bot] Merge 26.9 to develop (Conflicts)

[github-actions]

Automatic merge failed! Please merge 26.9 into fb_bot_merge_26.9 and resolve conflicts manually.

git fetch
git checkout fb_bot_merge_26.9
git reset --hard origin/develop
git merge f6bb33a12ed6d74e7abaa229684c3354c023f24c -m "Merge 26.9 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_26.9