Merge "Remove CLM issues with commons-collections"