[3/4] cxf git commit: Fixing backmerge

Fixing backmerge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f335e1b9 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f335e1b9 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f335e1b9 Branch: refs/heads/3.1.x-fixe

[3/4] cxf git commit: Fixing backmerge

Fixing backmerge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/08611f8a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/08611f8a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/08611f8a Branch: refs/heads/2.7.x-fixe