Fix circular import
Merge remote-tracking branch 'origin/custom_location_data' into custom_location_data+system-custom-data

Conflicts:
	corehq/apps/locations/util.py