The Upgraded CERN DC-current Calibrator