Fixes import submit bug and other import related bugs
Refactoring and fixes to cancel of import bug
Merge pull request #108 from reciprocity/feature/import_extra_work

Fixes to import submit and import cancellation