Re #10814. Bringing back old checking code.
Merge remote-tracking branch 'origin/bugfix/10814_failing_builds'
Merge remote-tracking branch 'origin/master' into feature/10813_clang_format_framework

Conflicts:
	Code/Mantid/Framework/API/src/FrameworkManager.cpp