EB-6981 - P1 fix for JDBC connection leak
Fix for Order update
EB-7133 Fix java script issue to work in IE and chrome
Merge remote-tracking branch 'upstream/v2.0.14.04' into rc_temp_up
EB-7133 Fix java script issue to work in IE and chrome
Merge branch 'prodsupport_up' into rc_temp_up
Merge remote-tracking branch 'origin/prodsupport' into hardening_r15

Conflicts:
	src/WebChannel/main/java/com/sterlingcommerce/xpedx/webchannel/common/XPEDXBreadcrumbDisplayComponent.java (whitespace only)
	src/WebChannel/main/java/com/sterlingcommerce/xpedx/webchannel/profile/org/DynamicQueryAction.java (whitespace only)
	src/WebChannel/main/webapp/xpedx/jsp/common/XPEDXPrepareHeader.jsp (whitespace only)
Merge remote-tracking branch 'upstream/hardening_r15' into hardening_r15

Conflicts:
	src/WebChannel/main/java/com/sterlingcommerce/xpedx/webchannel/common/XPEDXBreadcrumbDisplayComponent.java
	src/WebChannel/main/webapp/xpedx/jsp/common/XPEDXPrepareHeader.jsp