Refs #8010 Fixed workspace averaging.
Merge branch 'feature/8010_osi_diffraction_bug' into develop