Backported fix for bug 111525: [Import/Export] Import file system doesn't include the top folder you select