Merged revisions 1537968 via svnmerge from 
http://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes



git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes@1537969 13f79535-47bb-0310-9956-ffa450edef68