[CXF-5073] Some more fixes to avoid endless recursions

git-svn-id: https://svn.apache.org/repos/asf/cxf/trunk@1491866 13f79535-47bb-0310-9956-ffa450edef68