Fix #534: Adding a project to a solution adds the configuration mapping in a place likely to cause merge conflicts