Export Callable fixed-rate bond and CPI bond.

Thanks to Simon Mazzucca.
Replace a call to a deprecated method.
Merge remote-tracking branch: upstream/master