Prep for Apache Commons Collections fix
25 files changed