Merge branch 'MasterBugFixing' into 'master'
Fix case of no MANIFEST in .bos to import which was broken with previous
refactor
On import, fix when there are several subfolders which correspond to
different repository stores due to previous refactoring code commit