work in progress
Validate reserved words in the UI
Merge remote-tracking branch 'origin/custom-data-choices' into system-custom-data

Conflicts:
	corehq/apps/custom_data_fields/models.py
	corehq/apps/custom_data_fields/views.py
Validate bulk-upload for reserved fields
Don't store system fields on the model

Switch strategy a bit.  Instead of storing system fields on the model,
just recognize them when accessing the entity fields and ignore.
Merge branch 'custom_location_data' into custom_location_data+system-custom-data

Conflicts:
	corehq/apps/locations/forms.py
Merge branch 'custom_location_data' of github.com:dimagi/commcare-hq into custom_location_data+system-custom-data
Merge branch 'system-custom-data' of github.com:dimagi/commcare-hq into custom_location_data+system-custom-data
Update to match system-custom-data
Merge branch 'master' of github.com:dimagi/commcare-hq into custom_location_data+system-custom-data
Merge remote-tracking branch 'origin/custom_location_data+locations-for-everyone' into custom_location_data+system-custom-data+locations-for-everyone

Conflicts:
	corehq/apps/users/bulkupload.py
update staging.yaml

[ci skip]
Merge remote-tracking branch 'origin/double-management+custom-case-list-pane+case-detail-tabs' into autostaging
Merge branch 'historical-forms' into autostaging
Merge remote-tracking branch 'origin/subscription-no-contact-info' into autostaging
Merge remote-tracking branch 'origin/revert-4205-revert-3841-86347-2' into autostaging
Merge remote-tracking branch 'origin/masterlist-workflow' into autostaging
Merge branch 'bulk-app-translate' into autostaging
Merge remote-tracking branch 'origin/case-detail-tabs+share-fixtures' into autostaging
Merge remote-tracking branch 'origin/share-fixtures' into autostaging