Fixes #794 - Fix the groupid for commons collections 4
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x