reverting revert of EB-4704 for additional fixes
EB-7453 - fixed truststore cert and placed in correct folder location
EB-7453 - fixed truststore certificate issue
EB-6257 : Added null pointer check when cAndfOrderEle element is null
EB-7608 Fixing display issue related to Google Chrome V37
EB-7453 - fixed updatests.xml to include truststore dir
Merge branch 'prodsupport' of http://s29exvm05.na.ipaper.com:8080/gitblit/git/xcomv2 into prodsupport
EB-7453 - fixed updates.xml to include truststore dir for autoupdate to work
EB-6257 : Added null pointer check wherever possible in error scenario
EB-7261 removed webtrends
EB-7261 removed webtrends
EB-7813 : Applying the same fix to 'Search within Results' functionality as I applied for the rest of the Catalog Search functionality in order to completely fix EB-7558 issue
Merge branch 'prodsupport' of http://s29exvm05.na.ipaper.com:8080/gitblit/git/xcomv2 into prodsupport
EB-7261
Merge branch 'prodsupport' of http://s29exvm05.na.ipaper.com:8080/gitblit/git/xcomv2 into prodsupport
To test SMTP modifications for sending emails through VeritivCorp

Conflicts:
	src/smcfs/dev/Foundation/properties/customer_overrides_dev.properties
Merge branch 'P2_EB7261' into prodsupport
EB-4704 - Print Order Detail
Merge branch 'prodsupport' of http://s29exvm05.na.ipaper.com:8080/gitblit/git/xcomv2 into prodsupport
EB-7259 add one more filter to check whether order should go to web hold