Fixing scope of CXF components which was breaking kitchen-sink