Corrected currency/collateral P&L issues

Signed-off-by: jsu <jsu@falconfone.com>