Adds more CollectionUtils methods for maps.
Merge commit 'c19e0adb8106276b5fae1f01e62704082a4a7d8b' into HEAD