Backport #629 and #635 to 3.0.9
Merge branch 'BroadleafCommerce-3.0.x' into develop