Replace commons-collections with guava: apply our house style to PR changes