Multi-root config now matches single root default

A long overdue reconciliation of the multi-root config, which now
matches the latest and greatest single root default config.