Remove unnecessary returns. Refs #8938.
Merge branch 'feature/8938_improve_icat_publish_gui' into develop