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

Job	Run time
build	5m 10s
test_when_cache_present (0, 12, 651)	31m 48s
test_when_cache_missing	0s
test_when_cache_present (1, 12, 651)	28m 45s
test_when_cache_present (2, 12, 651)	28m 54s
test_when_cache_present (3, 12, 651)	32m 26s
test_when_cache_present (4, 12, 651)	28m 37s
test_when_cache_present (5, 12, 651)	29m 27s
test_when_cache_present (6, 12, 651)	29m 13s
test_when_cache_present (7, 12, 651)	34m 9s
test_when_cache_present (8, 12, 651)	28m 6s
test_when_cache_present (9, 12, 651)	28m 50s
test_when_cache_present (10, 12, 651)	30m 53s
test_when_cache_present (11, 12, 651)	33m 2s
test_when_cache_present (12, 12, 651)	22m 3s
save_test_times_when_cache_missing	0s
save_test_times_when_cache_present	21s
	6h 31m 44s

Provide feedback