[bot] Merge 25.3 to 25.7 (Conflicts)#1129

Merged

github-actions[bot] merged 2 commits intorelease25.7-SNAPSHOTfrom

25.7_fb_bot_merge_25.3

Jul 15, 2025

Commits on Jul 14, 2025

Update a couple dependencies (#1125)
labkey-adam
authored

Commits on Jul 15, 2025

Merge 25.3 to 25.7
labkey-chrisj
committed