3.0.9 backports for BroadleafCommerce/BroadleafCommerce#629 and BroadleafCommerce/BroadleafCommerce#635