[Geoadmin] workarounds for location importing problems. yuck.
[AI-406] Updating the importer to the latest iteration of api2

Also: merged Promise and Remote, so now what we have is a sort
of retryable-promise. Need a better name.