Fixes #794 - Utilize commons 4 for better generics
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x