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

Conflicts:
	Code/Mantid/MantidQt/MantidWidgets/src/CatalogSearch.cpp
Merge branch 'feature/8244_icat_date_selector_issues' into develop