Feature/sw 202 ci pass cherry picks #707

Job	Run time
build (base)	5m 51s
build (clang)	5m 18s
build-gcc-heli	5m 43s
autotest (sitltest-copter-tests1a)	18m 21s
autotest (sitltest-copter-tests1b)	19m 13s
autotest (sitltest-copter-tests1c)	18m 13s
autotest (sitltest-copter-tests1d)	17m 57s
autotest (sitltest-copter-tests1e)	20m 7s
autotest (sitltest-copter-tests2a)	19m 1s
autotest (sitltest-copter-tests2b)	32m 20s
autotest-heli (sitltest-heli)	17m 41s
	2h 59m 45s

Provide feedback