Merge pull request #3427 from enkidienne/less-armor #1491

Job	Run time
code-tests (CODE)	5m 29s
code-tests (WEB)	3m 7s
map-tests (operation_trebuchet)	2m 14s
map-tests (slayer)	2m 48s
map-tests (firefight)	2m 20s
map-tests (crusade)	2m 51s
map-tests (stranded)	2m 22s
map-tests (first_contact)	2m 54s
map-tests (ks7_elmsville)	4m 39s
map-tests (ks7_elmsville_spaceodp)	3m 55s
map-tests (base_assault)	2m 46s
map-tests (base_assault_unsc_defend_vs_urf)	2m 37s
map-tests (unsc_achlys)	2m 36s
map-tests (base_assault_neutral_base)	2m 50s
map-tests (base_assault_neutral_base_taurus)	2m 45s
map-tests (geminus_city)	4m 12s
map-tests (geminus_city_urf_active)	3m 30s
map-tests (system_conquest)	7m 38s
	1h 1m 33s

Provide feedback