refs #6449 more careful mutexing
refs #6449 hopefully fixed lock in the DiskBufferTest.h
Merge branch 'bugfix/6449_fixMDBoxSplittingPerformance' into develop
Merge branch 'develop' of https://github.com/mantidproject/mantid into develop