Ensure that SearchPaths is kept in sync with SearchPathsRerootable
Merge topic 'add-find-root-system_only-mode' into next

a98f2d9a Ensure that SearchPaths is kept in sync with SearchPathsRerootable