REQS-306 - FX Swap nodes for curve calibration

Address review comments