Merge pull request #5619 from shuffle2/fix-build msbuild: put pugixml in Externals solution filter; fix project reference
