Fixes #794 - Utilize commons 4 for better generics
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x
Fixes #794 - Fix the groupid for commons collections 4
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x
Fix file paths for failing tests on Linux as part of #838
Merge branch 'BroadleafCommerce-3.1.x' into develop