Re #8554 and 8566. Fixed bug found in testing.

Cherry-picking from master.

Conflicts:

	Code/Mantid/scripts/SCD_Reduction/ReduceSCD_OneRun.py
Re #8566. Putting back the cylindrical fix.