[CXF-5309] Adding another patch from Andriy, with few minor updates

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