merge 933727 from trunk to branch - ARIES-186 AriesTrader - some changes to prevent repeat lookup of the TradeServicesManager reference in the jsps and a little more cleanup