Remove CollectionUtils module and references
Remove StringUtils.htmlEscape() function
Merge remote-tracking branch 'upstream/master' into remove-collection-utils
Merge pull request #8960 from le717/remove-collection-utils

Remove CollectionUtils and StringUtils.htmlEscape()