[CXF-4817] Merging some of the changes to 2.7.x

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