fix to syntax conformance test handling of contribution_type_id
Merge pull request #3416 from eileenmcnaughton/test_fixes

fix to syntax conformance test handling of contribution_type_id