WF-1678/Changes required for axiom-1.2.13 to avoid ConcurrentModificationException during iterator handling