Re #7360 Fix problem with output files
Re #7360 Fix problem with output when no output dir specified
Merge remote branch 'origin/feature/7360_fix_hfir_output'. Re #7360.

Conflicts:
	Code/Mantid/scripts/reduction_workflow/instruments/sans/hfir_command_interface.py