move location_id into supply point
always wrap api cases as CommCareCases
Merge pull request #4840 from dimagi/location-id-fix

Location id fix