Recording some merges


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