Merge remote-tracking branch 'origin/feature/6669_LoadLogPropertyTable'
Merge remote branch 'origin/feature/6848_FindGon'
Merge remote-tracking branch 'origin/feature/7073_peakHKLoffsets'
Merge remote-tracking branch 'origin/feature/7056_data_stitching_api2'
Merge remote-tracking branch 'origin/feature/7096_Improve_docs_for_FindUBUsingLatticeParameters'
Merge remote-tracking branch 'origin/feature/6964_git_test_macro_check_develop'
Merge remote branch 'origin/feature/7109_MantidEVImprov1'
Merge remote branch 'origin/feature/6840_errors'
Fix Glob test. Refs #7138

Also fix AnalysisDataServiceTest. It fails otherwise if one sets the
Mantid preferences to show invisible workspaces
Merge branch 'bugfix/7138_globtestfix' into develop