Merge branch 'feature/9964_apply_correction_bug' into bugfix/9344_indirect_python_refactoring

Conflicts:
	Code/Mantid/scripts/CMakeLists.txt

Refs #9344
Merge branch 'bugfix/9344_indirect_python_refactoring' into develop

Conflicts:
	Code/Mantid/scripts/CMakeLists.txt

Refs #9344