Allow for env vars to have spaces in some cases Upstream-commit: 014bab03efd67367d13231c08cc43e2e73578824 Component: engine