Fixes some integration-cli on userns Upstream-commit: 6e8479bdfa719f6e5835425d26dc5bd0f6945697 Component: engine