Merge remote branch 'origin/feature/8591_helper_and_fixes'
Set properties for a given ICATProxy. Refs #8607.
Set properties for a given ICAT3Proxy. Refs #8607.
Merge branch 'feature/8607_icat_stests_windows' into develop. Refs #8607.

Conflicts:
	Code/Mantid/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h