[CXF-4950] Some follow up updates based on the analysis from Andrei

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