Tidy up after merge.

Additionally CommonAssemblyInfo's (in addition to shared common version) can upset xbuild, it's a bit particular about duplicate statements.