Fix compilation errors caused by #866
Merge branch 'BroadleafCommerce-3.1.x' into develop