remove redundant try/catches in tests
add i18n to error messages.
mark function private
use exceptions for flow control and add better user facing message
test for invalid domain references
Merge pull request #3399 from dimagi/location-import-safety

Location import safety
[DO NOT MERGE] make a bogus change to force a reindex
Merge branch 'multimedia-case-properties' into autostaging
Merge remote-tracking branch 'origin/sql-dailyformstats' into autostaging
Merge branch 'pretty-user-display' into autostaging
Merge remote-tracking branch 'origin/cache-locations' into autostaging
Merge remote-tracking branch 'origin/hq-dropdown' into autostaging
Merge remote-tracking branch 'origin/mailchimp' into autostaging
Merge branch 'make-preindex-fail-loudly' into autostaging
Merge branch 'bogus-reindex' into autostaging
update submodule refs