On import, fix when there are several subfolders which correspond to
different repository stores due to previous refactoring code commit
fix import
Use the correct resource to load. Will avoid random NPE.
Merge branch 'master' into 'BS-9320_CasAdm_CaseList'