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

Merged

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

25.7_fb_bot_merge_25.3

Jul 8, 2025

Commits on Jul 5, 2025

Add test for "Reset" email notifications settings (#2534)
labkey-adam
authored

Commits on Jul 8, 2025

Merge 25.3 to 25.7
labkey-klum
committed