Conflicts:
	Framework/Algorithms/src/CopyInstrumentParameters.cpp
	Framework/Algorithms/src/CropWorkspace.cpp
	Framework/Algorithms/src/DiffractionEventCalibrateDetectors.cpp
	Framework/Algorithms/src/FindCenterOfMassPosition.cpp
	Framework/Algorithms/src/FindCenterOfMassPosition2.cpp
	Framework/Algorithms/src/GetDetOffsetsMultiPeaks.cpp
	Framework/Algorithms/src/GetDetectorOffsets.cpp
	Framework/Algorithms/src/MaskDetectorsIf.cpp
	Framework/Algorithms/src/NormaliseToMonitor.cpp
	Framework/Algorithms/src/Q1DWeighted.cpp
	Framework/Algorithms/src/SANSDirectBeamScaling.cpp
	Framework/Algorithms/src/SolidAngle.cpp
Re #11035