Formatting changes only: tabs->spaces. Refs #7156
Migrate OSIRISDiffractionReduction to new api. Refs #7156
Merge branch 'feature/7156_migrate_OSIRISDiffractionReduction' into develop