Merge remote-tracking branch 'origin/feature/9031_eqsans_ui_tweaks'
Merge remote-tracking branch 'origin/feature/9069_refactor_catalog_interface'
Merge remote-tracking branch 'origin/master' into feature/9026_composite_catalog. Refs #9026.

Conflicts:

- Code/Mantid/Framework/API/inc/MantidAPI/ICatalog.h
- Code/Mantid/Framework/ICat/inc/MantidICat/ICat3/ICat3Catalog.h
Remove unused IDS methods. Refs #9026.
Merge branch 'feature/9026_composite_catalog' into develop