[bot] Merge 26.5 to develop (Conflicts)

[github-actions]

Automatic merge failed! Please merge 26.5 into fb_bot_merge_26.5 and resolve conflicts manually.

git fetch
git checkout fb_bot_merge_26.5
git reset --hard origin/develop
git merge 3422dcc16b9e5693a9ffc0a039ad7aa6c2f79ec9 -m "Merge 26.5 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.5

[github-actions]

ERROR Automatic merge failed!