partial support for container hot-deploy
#268 : Referencing the 2.4.2 pom for ehcache presents difficulties during builds for some users
Merge remote-tracking branch 'origin/hot-deploy' into BroadleafCommerce-3.0.x

Conflicts:
	common/pom.xml
#269 : Make sure ThreadLocals are cleared out at the end of the request
#269 : Make sure ThreadLocals are cleared out at the end of the request
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x' into develop

Conflicts:
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/search/service/solr/SolrIndexServiceImpl.java