[MIRROR] Borers small rebalance + fix #1515

Job	Run time
Collect data for other tasks	14s
Run Linters	2m 14s
Compile Maps	6m 6s
Windows Build	2m 36s
Integration Tests (birdshot) / run_integration_tests	11m 8s
Integration Tests (blueshift) / run_integration_tests	11m 57s
Integration Tests (deltastation) / run_integration_tests	14m 30s
Integration Tests (icebox) / run_integration_tests	11m 19s
Integration Tests (kilostation2) / run_integration_tests	14m 14s
Integration Tests (metastation) / run_integration_tests	14m 26s
Integration Tests (gateway_test) / run_integration_tests	12m 27s
Integration Tests (multiz_debug) / run_integration_tests	10m 12s
Integration Tests (northstar) / run_integration_tests	11m 53s
Integration Tests (nssjourney) / run_integration_tests	13m 55s
Integration Tests (runtimestation) / run_integration_tests	13m 21s
Integration Tests (voidraptor) / run_integration_tests	14m 23s
Integration Tests (tramstation) / run_integration_tests	14m 35s
Alternate Tests (515, 1603, runtimestation) / run_integration_tests	11m 58s
Check Alternate Tests	1s
Compare Screenshot Tests	53s
	3h 12m 22s

Provide feedback