Merge "Discover the correct default config dir"