MDL-39177 make sure we don't remove existing directories when cleaning up unzip