Refs #8346 Change workspace averaging to only use unique names.
Merge branch 'bugfix/8346_OSIRIS_diff_merging' into develop