Take quantity into account when calculating banded fulfillment option pricing
(cherry picked from commit 5cf105c3bf0d91d85e214f042c96a0242298b0cd)
BLC-832 - Enhance tests for banded weight/price fulfillment to allow for quantities into account. Part of pull request #32 (cherry picked from commit 7bdd21e46baaf9c66d1023de2d2bdc1b135a12e4)
Merge branch 'BroadleafCommerce-2.0.x' into BroadleafCommerce-2.1.x
BLC-834 : Oracle complains about a duplicate index on the name field of BLC_ADMIN_ROLE
Merge remote-tracking branch 'origin/BroadleafCommerce-2.0.x' into BroadleafCommerce-2.0.x
Merge remote-tracking branch 'remotes/origin/BroadleafCommerce-2.0.x' into BroadleafCommerce-2.1.x
[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