Refactor create contact and update contact for survey answer birth_date validation
Fix conflicts after remerging MH-355 to dev
Fix more conflicts