Re-added search/replace fix of paths. See also FS#37992



git-svn-id: file:///srv/repos/svn-community/svn@104867 9fca08f4-af9d-4005-b8df-a31f2cc04f65