Prep for Apache Commons Collections fix
4 files changed