Fix bug where addition to a merge file group were not being recorded
properly in the undo/redo stack.
Fix bugs in the File Group property page where it wasn't possible to
have the same sub file group appearing in a merge group multiple times.