Solved the split workspaces bug.  Refs #7150.
Merge difference.  Refs #7150.
Remove or relevel debug output.  Refs #7150.
Resolved merging conflict.  Refs #7150.
Merge branch 'develop' of github.com:mantidproject/mantid into develop