Merge remote branch 'origin/feature/6749_import_fp_irf'
Merge remote branch 'origin/feature/6650_powder_redux'
Loose some exception condition.  Refs #6017.
Merge branch 'feature/6017_improve_peak_fitting' into develop