[bot] Merge 26.4 to develop (Conflicts)

[github-actions]

Automatic merge failed! Please merge 26.4 into fb_bot_merge_26.4 and resolve conflicts manually.

git fetch
git checkout fb_bot_merge_26.4
git reset --hard origin/develop
git merge a10d8e6456dda47aee0045f335c1d771273d901f -m "Merge 26.4 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.4