Merge remote branch 'origin/feature/8113_snspowderredux_small_ref_change'
Merge remote-tracking branch 'origin/feature/6977_remove_flatbackgound_alg'
Revert "Refs #5421 Updating system tests."

This reverts commit 06094c90762a84248e94af2e025ea04196168a13.
Merge branch 'bugfix/8122_broken_systests_on_master' into develop