Merged revisions 1507293 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

................
  r1507293 | sergeyb | 2013-07-26 13:39:53 +0100 (Fri, 26 Jul 2013) | 13 lines
  
  Merged revisions 1507286-1507287 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1507286 | sergeyb | 2013-07-26 13:31:12 +0100 (Fri, 26 Jul 2013) | 1 line
    
    [CXF-5161] Fixing AbstractGrantHandler typo and updating it to correctly work in a case where a concrete implementation wants to support more than one grant type
  ........
    r1507287 | sergeyb | 2013-07-26 13:33:15 +0100 (Fri, 26 Jul 2013) | 1 line
    
    Reverting a change to JAXRSXmlSecTest
  ........
................


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