Included scaling and normalisation step.

Scaling option now effects both Calibration and Resolution.

Refs #5007
Fixed issues with system tests.

Refs #5007
Merge branch 'feature/5007_c2e_calib_scale_option' into develop