Merged revisions 1563847 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1563847 | ay | 2014-02-03 12:51:11 +0100 (Mon, 03 Feb 2014) | 10 lines

  Merged revisions 1563840 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1563840 | ay | 2014-02-03 12:28:14 +0100 (Mon, 03 Feb 2014) | 2 lines

    a minor clean up for CXF-5517

  ........

........

git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes@1563848 13f79535-47bb-0310-9956-ffa450edef68