Recording revisions 1485253,1485254 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@1485618 13f79535-47bb-0310-9956-ffa450edef68