Refs #8010 Fixed workspace averaging.
Merge remote-tracking branch 'origin/feature/8010_osi_diffraction_bug'