[PLAT-6542] Fixed credit curve calibration

Also includes [PLAT-6536].
Reviewed by Ian.