Merge remote-tracking branch 'origin/prodsupport' into hardening_r15
eb-7237: converted search form to use html5 placeholder text and a separate go button

the search input no longer uses the watermark plugin
EB-6723: new cXML punchout map for Disney
Merge remote-tracking branch 'upstream/prodsupport' into prodsupport

Conflicts:
	src/WebChannel/main/webapp/xpedx/jsp/common/XPEDXPrepareHeader.jsp
Merge remote-tracking branch 'upstream/prodsupport' into prodsupport