[CXF-5976] Some changes to support more explicit collection variations