Simplify config data code a bit (CAN ONLY GO IN THE NEXT MAJOR RELEASE) #2696

Job	Run time
build	7m 5s
test_when_cache_present (0, 11, 700)	32m 41s
test_when_cache_missing	0s
test_when_cache_present (1, 11, 700)	29m 48s
test_when_cache_present (2, 11, 700)	28m 17s
test_when_cache_present (3, 11, 700)	31m 46s
test_when_cache_present (4, 11, 700)	26m 58s
test_when_cache_present (5, 11, 700)	27m 26s
test_when_cache_present (6, 11, 700)	27m 28s
test_when_cache_present (7, 11, 700)	27m 18s
test_when_cache_present (8, 11, 700)	27m 3s
test_when_cache_present (9, 11, 700)	29m 34s
test_when_cache_present (10, 11, 700)	38m 3s
test_when_cache_present (11, 11, 700)	21m 32s
save_test_times_when_cache_missing	0s
save_test_times_when_cache_present	19s
	5h 55m 18s

Provide feedback