[CXF-5219]:Apply patch from Kyle and add testcase

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