integration-cli: error logging improvements Upstream-commit: 3c5eac362884bb60f9c7778966559d04b44cfb6a Component: engine