fixup! 800b45a

Change the behavior of `ENV[k]` substitution and have values from `ENVIRONMENT`
directive take precedence over OS env vars. This gives more control over test
execution environment and explicit overrides of OS env vars.

daemon/internal/newrelic/integration/test.go

@@ -289,9 +289,9 @@ func (t *Test) subEnvVars(in []byte) []byte {
 	re := regexp.MustCompile("ENV\\[.*?\\]")
 	return re.ReplaceAllFunc(in, func(match []byte) []byte {
 		k := string(match[4 : len(match)-1])
-		v, present := os.LookupEnv(k)
+		v, present := t.Env[k]
 		if !present {
-			v = t.Env[k]
+			v = os.Getenv(k)
 		}
 		return []byte(v)
 	})