CXF-6120 fixed the build and cleaned up the message stub class