Load Optimizations
(cherry-picked from 153f24d)
fix unit tests
(cherry-picked from 5b50eaf)
remove incorrect schema reference
(cherry-picked from f991de3)
BLC-829 : DiscreteOrderItems inside of a BundleOrderItem are getting included in the main cart
(cherry picked from commit 0ab4950c77402428e7746d1e3db57b2ef4001b0f)

Conflicts:
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/domain/BundleOrderItemFeePriceImpl.java
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/domain/BundleOrderItemImpl.java
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/domain/DiscreteOrderItemImpl.java
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/domain/OrderItemImpl.java