Manual sweep of !31421 (Add NSWCalibTool to NSWCalibToolsConfigDb and use it)

Hi,

this MR is a manual sweep of !31421 (merged) since the automatic sweep to master failed.

Best, Nico