Fix some intermittent test failures#2495

labkey-tchad merged 2 commits intorelease25.3-SNAPSHOTLabKey/testAutomation:release25.3-SNAPSHOTfrom

25.3_fb_variousTestFixesLabKey/testAutomation:25.3_fb_variousTestFixesCopy head branch name to clipboard