Merge remote-tracking branch 'origin/feature/9973_elwin_file_browse_sqw'
Merge branch 'master' into bugfix/9731_loadmonitors_defaults

Conflicts:
	Code/Mantid/Framework/Kernel/inc/MantidKernel/FileValidator.h
	Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp
Re #9731
Re #9731. Fixed errors after a merge.
Merge branch 'bugfix/9731_loadmonitors_defaults' into develop

Conflicts:
	Code/Mantid/Framework/Kernel/inc/MantidKernel/FileValidator.h
	Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp
Re #9731.