EB-6300 check-in missing sub flow entry after merge
EB-6613 - Checked-in for List Desc to be 250
Merge branch 'v2.0.14.04' of http://s29exvm05.na.ipaper.com:8080/gitblit/git/xcomv2 into v2.0.14.04
EB-6913- Code Clean up
EB-309 performance fix for user profile page
EB-7027 : Fixed the issue of single quote in either line cust Acct# or po# in catalog page.
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
EB-7154: Bug fixed (On behalf of Vijaya Chilukuri).
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)
eb-6981: fixing compilation errors in AutocompleteCacheUtil

cleaned up error handling, throw early / catch late
added additional defensive checks for transaction rollback / commit
Merge remote-tracking branch 'origin/prodsupport' into hardening_r15
EB-7159: Red error message bug fixed
EB-7159: Bug fixed for checkout button
EB- 7201: Updated CSS for Scroll bar on Change Location Modal (IE8).
EB-6257 - Rollback of Duplicate order issue fix code