Patch for CXF-3096

[Hartmut Lang]

Hi Committers,

i added a patch with code fixes and additional testcase to
https://issues.apache.org/jira/browse/CXF-3096

Would be great if one of the committers could pick this up and make it happen 
in one of the next releases.

Thanks,
Hartmut