[18.09 backport] Swagger fixes Upstream-commit: 556456701d1bd69a20f62d68d22257b8a6ad71c0 Component: engine