[Version Control] Bug 13886 - Conflicted project files and MergeView fixes.

No longer throw exception because we modify children list on destroy.
We now have an attachable window for project files which are in a broken project.
Merge pull request #381 from mono/mergecsproj

[Version Control] Resolve Conflicts command for broken projects/solutions.