fix zipped artifact structure
(cherry picked from commit a7b0d1e)