cleanup/fix integration-cli for overlay in overlay Upstream-commit: 91abff41dda96244ee3e4ae47e7c37c5067657a7 Component: engine