BLC-843
moved cartstatefilter to blPostSecurityFilterChain
show discounts in cart
change the cart table header to say average discount
show breakdown only if the num of products are greater than one
add discount breakdown  to order summary screens
show promotion message  and show total savings
add sample e bundles to test
Merge remote-tracking branch 'origin/upstream-develop' into develop

Conflicts:
	combined/src/main/webapp/WEB-INF/applicationContext-filter-combined.xml
	site/src/main/resources/runtime-properties/development.properties
	site/src/main/webapp/WEB-INF/applicationContext-filter.xml