#883 - Make sure PersistenceManagerFactory bean is initialized before any RuleBuilderFieldService bean is initialized
Merge remote-tracking branch 'origin/BroadleafCommerce-3.1.x' into BroadleafCommerce-3.1.x
Merge remote-tracking branch 'origin/BroadleafCommerce-3.1.x' into develop
Merge branch 'develop' into sku_browsing