Re #7987. Removing assign for parameter that went away.
Re #7987. Update reference results. These could be wrong.
Merge remote branch 'origin/master' into feature/7987_powder_refactor

Conflicts:
	SystemTests/AnalysisTests/ReferenceResults/PG3_4844_reference.gsa
Re #7987
Re #7987. Updating reference results.
Merge remote-tracking branch 'origin/feature/7987_powder_refactor'