On import, fix when there are several subfolders which correspond to
different repository stores due to previous refactoring code commit
fix import
Merge branch 'master' into 'BS-11016_ProcessMonitoring-ErrorManagement'