load enhancements
(cherry picked from commit 69877cda3b323c2da3a26f32c48e1111e61fed45)

Conflicts:
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/domain/DiscreteOrderItemImpl.java
Fix a merge problem related to product bundle pricing
(cherry picked from commit 4a9cd33e59aafdf3e29a3b33a6612fa76eb69588)

Conflicts:
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/catalog/domain/ProductBundleImpl.java