Merge remote-tracking branch 'origin/feature/9320_LoadRawOptions'

Conflicts:
	Code/Mantid/Framework/DataHandling/src/LoadRaw3.cpp

Refs #9320
Merge branch 'master' of github.com:mantidproject/mantid
Merge remote-tracking branch 'origin/feature/9320_LoadRawOptions'
Merge remote branch 'origin/feature/9498_SavePlot1D_older_matplotlib'
Merge remote branch 'origin/feature/9483_using_headers'
Merge remote-tracking branch 'origin/feature/9442_for_valgrind_jobs'

Re #9442

Conflicts:
	Code/Mantid/Framework/Crystal/test/CMakeLists.txt
Merge remote-tracking branch 'origin/bugfix/9484_maskfile_command_not_working_in_batch_mode'
Merge branch 'feature/9512_expose_workspace_setcomment_to_python' into develop

Conflicts:
	Code/Mantid/Framework/Crystal/test/CMakeLists.txt