Workaround for [CXF-5803]: error processing by context injection
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf