[BISERVER-11284] Removes a dependency on the backport version of java.util.Collections. Fixes compiler generics warnings.
Merge pull request #1589 from lucboudreau/master

[BISERVER-11284] Removes a dependency on the backport version of java.ut...