revert changes for CXF-5732
Merge branch '2.7.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 2.7.x-fixes