Lps 48870 Replaced instances of UniqueList with ArrayList, HashSet, or LinkedHashSet

See individual commits for details