Merge pull request #6119 from thejonroberts/fix-contact-type-validation #1196

Job	Run time
preparation	11s
rspec_parallel ([0, 1, 2, 3]) / RSpec Groups [0, 1, 2, 3]	3m 19s
rspec_parallel ([8, 9, 10, 11]) / RSpec Groups [8, 9, 10, 11]	3m 32s
rspec_parallel ([4, 5, 6, 7]) / RSpec Groups [4, 5, 6, 7]	3m 25s
combine_and_report / combine_and_report	15s
	10m 42s

Provide feedback