Changes to make submit_claim_spec work with new claimant_type field