Merging from 1.0.x


git-svn-id: https://svn.apache.org/repos/asf/cxf/fediz/trunk@1459735 13f79535-47bb-0310-9956-ffa450edef68