Merge branch 'BroadleafCommerce-3.1.x' into develop

Conflicts:
	pom.xml
Jboss container compatibility
(cherry picked from commit 85aa12d)
Merge from upstream