Refs #9621 Remove fixed grouping. Use file definition instead.
Refs #9621 Update Parameter files and add grouping files.
Merge remote-tracking branch 'origin/master' into feature/9621_fixed_grouping_file

Refs #9621

Conflicts:
	Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py
Merge branch 'feature/9621_fixed_grouping_file' into develop