Merge remote-tracking branch 'origin/master' into feature/8322_icat_refactor_algorithms
Merge remote-tracking branch 'origin/master' into feature/8322_icat_refactor_algorithms. Refs #8322.

Conflicts:
	Code/Mantid/Framework/ICat/inc/MantidICat/CatalogSearchParam.h
	Code/Mantid/Framework/ICat/src/CatalogSearchParam.cpp
Merge branch 'feature/8322_icat_refactor_algorithms' into develop. Refs #8322.

Conflicts:
	Code/Mantid/Framework/ICat/src/CatalogSearchParam.cpp