Don't recreate the_geom if it already exists in imported data. Fixes 1901
Merge branch 'fix/1901' into develop