Servlet configuration required for #869
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x