Some cleanup for config server 3 #3607

Job	Run time
build	3m 16s
test_when_cache_present (0, 9, 670)	23m 33s
test_when_cache_present (1, 9, 670)	24m 2s
test_when_cache_present (2, 9, 670)	22m 5s
test_when_cache_present (3, 9, 670)	25m 7s
test_when_cache_present (4, 9, 670)	24m 5s
test_when_cache_missing	0s
test_when_cache_present (5, 9, 670)	23m 22s
test_when_cache_present (6, 9, 670)	24m 13s
test_when_cache_present (7, 9, 670)	27m 48s
test_when_cache_present (8, 9, 670)	28m 0s
test_when_cache_present (9, 9, 670)	13m 36s
save_test_times_when_cache_missing	0s
save_test_times_when_cache_present	16s
	3h 59m 23s

Provide feedback