[PLAT-6542] Fix credit curve calibration

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