[KC-6039] - Import mappers can take more than one file each
[KC-6038] - Fix an issue with Import Map tasks hanging causing long import jobs