CDITCK-371 Fix ArchiveBuilder ShrinkWrap optimization