partial support for container hot-deploy
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