Merge remote branch 'origin/feature/9021_basis_ghost_removal'
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 branch 'feature/7987_powder_refactor' into develop

Conflicts:
	SystemTests/AnalysisTests/ReferenceResults/PG3_4844_reference.gsa
Re #7987