[CXF-5561] More updates

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