Add braces to address Intel compiler warning. Refs #9376.
Merge branch 'feature/9376_icat_create_mantid_dataset' into develop

Use generic soap error handler on dev.

Conflicts:

- Code/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp
Merge branch 'develop' of github.com:mantidproject/mantid into develop