Address inconsistent type vs location_type usage
Merge pull request #4603 from dimagi/type-to-location_type

Address inconsistent type vs location_type usage