More flakey fixes #22524

Job	Run time
Start Gate	1s
Start Gate	1s
Start Gate	1s
Windows Build	1m 45s
Windows Build	1m 15s
Windows Build	1m 26s
Compile Maps	40s
Compile Maps	41s
Compile Maps	45s
Run Linters	3m 22s
Run Linters	3m 7s
Run Linters	3m 5s
Integration Tests (BASIC_TESTS) / run_integration_tests	4m 3s
Integration Tests (BASIC_TESTS) / run_integration_tests	3m 35s
Integration Tests (BASIC_TESTS) / run_integration_tests	3m 27s
Integration Tests (CREATE_AND_DESTROY_TEST) / run_integration_tests	3m 44s
Integration Tests (CREATE_AND_DESTROY_TEST) / run_integration_tests	3m 13s
Integration Tests (CREATE_AND_DESTROY_TEST) / run_integration_tests	3m 4s
Integration Tests (RUIN_PLACEMENT_TEST) / run_integration_tests	4m 21s
Integration Tests (RUIN_PLACEMENT_TEST) / run_integration_tests	3m 50s
Integration Tests (RUIN_PLACEMENT_TEST) / run_integration_tests	3m 57s
Integration Tests (PLANET_GEN_TEST) / run_integration_tests	4m 33s
Integration Tests (PLANET_GEN_TEST) / run_integration_tests	4m 59s
Integration Tests (PLANET_GEN_TEST) / run_integration_tests	4m 45s
Integration Tests (SHIP_PLACEMENT_TEST) / run_integration_tests	9m 35s
Integration Tests (SHIP_PLACEMENT_TEST) / run_integration_tests	8m 51s
Integration Tests (SHIP_PLACEMENT_TEST) / run_integration_tests	8m 45s
Completion Gate	2s
Completion Gate	2s
Completion Gate	2s
	1h 30m 57s

Provide feedback