Switch order of import step notifications to reflect steps in ManagedImportRequestI.
Re-organise file upload events.