Merge remote-tracking branch 'origin/feature/9328_ninja_gomp'
Refs #8685. Merge 'origin/feature/8685_matrixws_filter'

Conflicts:
	Code/Mantid/Framework/Algorithms/src/GenerateEventsFilter.cpp
Merge remote-tracking branch 'origin/bugfix/9328_snspowder_no_char'
Merge remote-tracking branch 'origin/feature/7284_framework_clang'
Added log messages back in.

It was just missing an include. refs #9217
Merge branch 'feature/9217_clang_logging' into develop