DEVKIT-738 Fix CXF generation