#921 - Add missing dependency
[maven-release-plugin] prepare release broadleaf-3.1.0-M2-6
[maven-release-plugin] prepare for next development iteration
#926 - Make usage of the special query building more available to CustomPersistenceHandler instances that call getPersistentRecords() and getTotalRecords(). Make filtering of records in the special collection more flexible as well.
#926 - Add sorting support for special query building for collections inside @Embeddable objects
#833 - Improve foreign key dynamic fields interaction on site
Add license headers
Fix broken SQL resulting from a previous merge
#932 - Update the UpdateTimestampsCache region to the new name
Merge branch 'BroadleafCommerce-3.1.0-M2-x' into BroadleafCommerce-3.1.x

Conflicts:
	admin/broadleaf-admin-module/pom.xml
	admin/broadleaf-contentmanagement-module/pom.xml
	admin/broadleaf-open-admin-platform/pom.xml
	admin/pom.xml
	common/pom.xml
	core/broadleaf-framework-web/pom.xml
	core/broadleaf-framework/pom.xml
	core/broadleaf-profile-web/pom.xml
	core/broadleaf-profile/pom.xml
	core/pom.xml
	integration/pom.xml
	pom.xml
#933 - Added a null check around getting billing and address state abbreviations.
Merge branch 'BroadleafCommerce-3.1.x' into develop

Conflicts:
	admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/service/persistence/module/BasicPersistenceModule.java
For #930 - First draft at passing integration tests with Spring 4
Spring 4 #930 - Fix the inheritance hierarchy of the LoaderListeners, remove now-defunct JPA2 PU decorator