[bot] Merge 26.3 to 26.4 (Conflicts)

[github-actions]

Automatic merge failed! Please merge 26.3 into 26.4_fb_bot_merge_26.3 and resolve conflicts manually.

git fetch
git checkout 26.4_fb_bot_merge_26.3
git reset --hard origin/release26.4-SNAPSHOT
git merge 5213677361a0ee1e8140c24d308445f3d11f7838 -m "Merge 26.3 to 26.4"

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=26.4_fb_bot_merge_26.3