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.7.x-fixes@1560443 13f79535-47bb-0310-9956-ffa450edef68
Recording revisions 1560442 via  git from
https://svn.apache.org/repos/asf/cxf/trunk



git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes@1560444 13f79535-47bb-0310-9956-ffa450edef68
Blocking revisions 1559978,1560026,1560086,1560364 via  git from
https://svn.apache.org/repos/asf/cxf/trunk



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