Merge remote-tracking branch 'origin/feature/7319_l2q_testing'
Merge remote branch 'origin/feature/7001_fit_peak'
Enable some masking tests for WISH now that SaveMask is fixed.

Refs #7343
Merge branch 'feature/7343_savemask_should_extract' into develop