RAZ-1910 - ZIP archives with same folder name put everything in the root folder : Updated for root folder issue.
Merge branch 'feature/issue_1910' into develop