#819. Added concept of admin server for Solr, to support swapping of
cores in Solr 4.4 and higher.(cherry picked from commit deccf1354f31f66e4b7e6436281fba5a35e8a179)
Fixes #836 - Fix a bug where rules were no longer being persisted in the admin
Fixes #788 - For adding sub collection items via a lookup you cannot always trust the type value from the submitted EntityForm
Revert "Fixes #788 - For adding sub collection items via a lookup you cannot always trust the type value from the submitted EntityForm"

This reverts commit ba186a19d846da7d02765249dd7ed0fa7241bb15.
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/search/service/solr/SolrHelperServiceImpl.java
#789 - Add check for file exists.    When first creating images, the file could have been created by another thread (which is ok).
#823 - Added support for RegEx field value comparisons and support for nested properties.
#813. Upgrading solrj to the latest.
Merge branch 'BroadleafCommerce-3.1.x' into develop
Merge branch 'develop' into sku_browsing