[maven-release-plugin] prepare release broadleaf-2.2.0-GA
[maven-release-plugin] prepare for next development iteration
load test updates
BLC-838 : Don't handle Solr index building inside of one transaction
adjust logging levels for the index service
[BLC-839] - Add validation to ensure sum of accepted payments is equal to the order total
Fix broken integration tests
[maven-release-plugin] prepare release broadleaf-2.0.7-GA
[maven-release-plugin] prepare for next development iteration
Revert tentative 2.0.7-GA release and fix incorrect save in CheckoutService
[maven-release-plugin] prepare release broadleaf-2.0.7-GA
[maven-release-plugin] prepare for next development iteration
Revert tentative 2.0.7-GA release and add save after checkout workflow
[maven-release-plugin] prepare release broadleaf-2.0.7-GA
[maven-release-plugin] prepare for next development iteration
Merge remote-tracking branch 'origin/BroadleafCommerce-2.0.x' into BroadleafCommerce-2.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-instrument/pom.xml
	core/broadleaf-profile-web/pom.xml
	core/broadleaf-profile/pom.xml
	core/pom.xml
	integration/pom.xml
	pom.xml
Merge branch 'BroadleafCommerce-2.1.x' into BroadleafCommerce-2.2.x

Conflicts:
	core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/controller/checkout/BroadleafCheckoutController.java
	integration/src/test/resources/bl-applicationContext-test.xml
Merge branch 'BroadleafCommerce-2.2.x' into develop

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-web/src/main/java/org/broadleafcommerce/core/web/controller/checkout/BroadleafCheckoutController.java
	core/broadleaf-framework/pom.xml
	core/broadleaf-profile-web/pom.xml
	core/broadleaf-profile/pom.xml
	core/pom.xml
	integration/pom.xml
	integration/src/test/resources/bl-applicationContext-test.xml
	pom.xml