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

........
  r1560443 | coheigea | 2014-01-22 18:05:10 +0000 (Wed, 22 Jan 2014) | 10 lines

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

  ........
    r1560442 | coheigea | 2014-01-22 18:01:39 +0000 (Wed, 22 Jan 2014) | 2 lines

    Refining a recent merge for security errors

  ........

........

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