Ref #10813 clang-format Framework.
Ref #10813 Fix bad clang-format.
Merge remote-tracking branch 'origin/master' into feature/10813_clang_format_framework

Conflicts:
	Code/Mantid/Framework/API/src/FrameworkManager.cpp
Re #10813. Fixing some of the osx errors.
Merge branch 'feature/10813_clang_format_framework'

Conflicts:
	Code/Mantid/Framework/WorkflowAlgorithms/src/SANSSolidAngleCorrection.cpp
Re #10813. Reformatting one file that didn't get it.
Merge remote-tracking branch 'origin/feature/10823_basis_311'