Merge remote-tracking branch 'upstream/rc_temp' into hardening_r15

Conflicts:
	src/WebChannel/main/java/com/sterlingcommerce/xpedx/webchannel/profile/org/DynamicQueryAction.java
	src/WebChannel/main/webapp/xpedx/jsp/common/XPEDXPrepareHeader.jsp
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
Merge remote-tracking branch 'upstream/hardening_r15' into hardening_r15
Merge remote-tracking branch 'upstream/hardening_r15' into hardening_r15
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
Merge remote-tracking branch 'origin/prodsupport' into hardening_r15
Merge remote-tracking branch 'upstream/hardening_r15' into hardening_r15
Merge branch 'hardening_r15' into prodsupport