Merged from trunk


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