Merge branch 'feature/8365_ILL_D2B' of github.com:mantidproject/mantid into feature/8365_ILL_D2B
Re #8365 Moved Loader from DataHandling to MDAlgorithms.
Re #8365 Fix Merge conflict.