#3099 Issues with fabric-cxf components

(cherry picked from commit 4d878d1f47226a2c3fb77aeee76814419f5edce0)