Merge remote-tracking branch 'origin/feature/8938_improve_icat_publish_gui'
Merge remote branch 'origin/feature/8291_redo_checkwsmatch_detailinfo'
Formatting changes to put the methods back in the right order

Refs #9166
Copy errors across to corrected workspace for all cases.

Refs #9166
Merge branch 'feature/9166_errors_on_calculategammabackground' into develop