WEB-7235 Improve handling of "packages" folders