integration-cli: fix testutil refactor merge conflict Upstream-commit: 765e543a385bef1174bc73e98b59af1c81b29b45 Component: engine