[CXF-5251] - A revised version of this patch following some comments by Oli

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