Merge remote-tracking branch 'origin/master' into feature/8274_icat_remove_old_gui. Refs #8274.

Conflicts:
	Code/Mantid/MantidQt/MantidWidgets/src/CatalogHelper.cpp
	Code/Mantid/MantidQt/MantidWidgets/src/CatalogSearch.cpp
Merge branch 'feature/8274_icat_remove_old_gui' into develop