Allow the user to close the importer w/o cancelling.
Use the correct method to indicate re-upload.
Adjust message when error returned during folder scanning.
Fix retry All issue (see #11138)
Merge pull request #1293 from jburel/close-import

Close import