Recording revisions 1470602,1470603,1470877,1470878 via  git from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes



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