Bug 16330: Move patches to OpenAPI