[CXF-5135] More fixes bound to the trunk only

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