sort locations by name in OTA restore

like they are in the Setup > Locations UI.
Previously they came down in an arbitrary order
Merge pull request #4895 from dimagi/sort-locations

sort locations by name in OTA restore