Use full name instead of short name. Refs #8823.
Merge branch 'feature/8823_icat_full_inst_name' into develop