Ports a couple of of misc fixes (#2218) #4914

Job	Run time
Run Linters	3m 2s
Collect data for other tasks	13s
Compile Maps	3m 14s
Windows Build	1m 46s
Integration Tests (birdshot) / run_integration_tests	11m 32s
Integration Tests (blueshift) / run_integration_tests	11m 59s
Integration Tests (deltastation) / run_integration_tests	11m 26s
Integration Tests (gateway_test) / run_integration_tests	12m 0s
Integration Tests (icebox) / run_integration_tests	11m 25s
Integration Tests (kilostation2) / run_integration_tests	11m 4s
Integration Tests (metastation) / run_integration_tests	10m 51s
Integration Tests (multiz_debug) / run_integration_tests	10m 28s
Integration Tests (northstar) / run_integration_tests	12m 29s
Integration Tests (nssjourney) / run_integration_tests	10m 45s
Integration Tests (runtimestation) / run_integration_tests	10m 10s
Integration Tests (tramstation) / run_integration_tests	11m 12s
Integration Tests (voidraptor) / run_integration_tests	10m 54s
Alternate Tests (515, 1621, runtimestation) / run_integration_tests	10m 5s
Check Alternate Tests	1s
Compare Screenshot Tests	58s
	2h 45m 34s

Provide feedback