Merged revision from 2.7.x-fixes

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