refs #9320 fixing merge conflicts with master accumulated

when this ticket went festering on test

Merge branch 'master' into feature/9320_LoadRawOptions

Conflicts:
	Code/Mantid/Framework/DataHandling/src/LoadRaw3.cpp
Merge branch 'feature/9320_LoadRawOptions' into develop