Merge remote-tracking branch 'origin/master' into feature/7636_icat_publish
Merge remote-tracking branch 'origin/master' into feature/7636_icat_publish. Refs #7636.

Conflicts:
	Code/Mantid/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h
Helper method to obtain file name from a given path. Refs #7636.
Added workspace property. Refs #7636.

- Removed unused headers.
- Forgot to remove `extractFileName` code from `exec`.
Encapsulate publish functionality. Refs #7636.
Upload of datafile works correctly. Refs #7636.
Let `saveNexus` take care of workspace groups. Refs #7636.
Merge remote-tracking branch 'origin/master' into feature/7636_icat_publish. Refs #7636.

Conflicts:
	Code/Mantid/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h
Added `setICATProxySettings` to publish method. Refs #7636.
Merge branch 'feature/7636_icat_publish' into develop