More leaks fixed in MomentumScaleCalibration
Merge pull request #1569 from ktf/fix-leaks-MomentumScaleCalibration2

QA fixes -- More leaks fixed in MomentumScaleCalibration