Merge pull request #576 from jgallimore/cxf-7701-backport

Backport of fix for CXF-7701