[test-integration] Small cleanups on integration cli Upstream-commit: 24c4226dc7675e114463654f138e00a229b73a02 Component: engine