ShipOps: More fixes #1298

Job	Run time
build-gcc-heli	3m 56s
build (base)	4m 8s
build (clang)	3m 58s
autotest-heli (sitltest-heli)	11m 11s
autotest (sitltest-copter-tests1a)	11m 41s
autotest (sitltest-copter-tests1b)	12m 32s
autotest (sitltest-copter-tests1c)	11m 11s
autotest (sitltest-copter-tests1d)	10m 56s
autotest (sitltest-copter-tests1e)	12m 46s
autotest (sitltest-copter-tests2a)	12m 37s
autotest (sitltest-copter-tests2b)	24m 30s
	1h 59m 26s

Provide feedback