Fix integration tests and integration cli to run on older versions Upstream-commit: a41051a9e43fe5b9caaee61210df8498fe876d97 Component: engine