Merge remote-tracking branch 'cxf-fediz/master' into FEDIZ-250