Some minor ArchiveBuilder performance optimizations
CDITCK-302 Fix WithAnnotations test in the context of CDI-318