Use restore_path systematically when merging theories (bug #20445).
When sessions are saved and then loaded from disk, goal identifiers are properly qualified. This is not the case when goals are still in memory due to reloading a file in the ide. So merging can get confused since several goals potentially share the same base name.
Showing with 8 additions and 9 deletions