b19e6a8e87
Keep getPreferredEnvFilePath consistent with its env parameter by passing that env through resolveDataDir in both bootstrap and Electron. This avoids silently falling back to process.env when a custom env map is supplied.