Changed iterator used during import, so it can replace fid and feature type

That functionality had been mistakenly left aside after changes made to improve performance
Made iterator throw exception if value to use for fid is null. Before, it used the default geotools-assigned fid
Merge remote-tracking branch 'origin/pr/539'