#875 - synchronize access to member variable
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x
Merge branch 'BroadleafCommerce-3.1.x' into develop