Revert "Revert "Merge branch 'tube_calibration_1' into develop re #6344""

This reverts commit a374e1d520cf75b5616476dccb60ef17636136e9.

Conflicts:

	Code/Mantid/Framework/Algorithms/test/ApplyCalibrationTest.h