Loading by intent changes to ODK Collect: hotosm/odkcollect#2

Ideally we want these updates to be merged into ODK, but it's not as simple as that.
We have a few tasks to complete first.