Fix codegen problems in swagger spec Upstream-commit: 7f4cf43637067d27a1035d4ff412710ead82bbab Component: engine