Update 2.6.x to pull from 2.7.x branch


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