Merge remote branch 'origin/bugfix/7055_loaddialog_invalid_input'
Refs #8110 Correcting OSIRIS parameters.
Merge branch 'feature/8110_OSI_diffraction_bug' into develop