Don't always just append env vars, replace defaults with ones from confi... Upstream-commit: aac9542a68ee59c62c2cf15df69f77640113bb95 Component: engine