Improve logging consistency. Refs #8898.
Use ICAT error message instead of custom. Refs #8898.
Merge branch 'feature/8898_better_icat_logging' into develop