Fixes #1082 - Hardcoding the default value for an integer system property to zero makes Broadleaf a sad panda
Merge branch 'BroadleafCommerce-3.1.x' into develop