[maven-release-plugin] prepare release broadleaf-3.1.0-M2-4
[maven-release-plugin] prepare for next development iteration
Fixes #804 - Make sure that streams are closed prior to attempting file move operations to prevent ownership problems on Windows
#916 - Protected against circular category references during Solr indexing
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
[maven-release-plugin] prepare release broadleaf-3.1.0-M2-5
[maven-release-plugin] prepare for next development iteration
#918 - Speed up PersistenceManager resolution
#921 - Json strings aren't escaped for admin hiddenfields objects
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/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/web/form/component/ListGridRecord.java
	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
Merge branch 'BroadleafCommerce-3.1.x' into develop