3535332 : Test breakages
switch to returning CopyOnWriteArrayList in CollectionFactory