Re #6191. Fix my silly error.
Merge branch 'feature/6191_remove_spectradetectormap' into develop

Re #6191.
Conflicts:
	Code/Mantid/Framework/API/src/MatrixWorkspace.cpp