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

........
  r1548550 | ay | 2013-12-06 16:01:50 +0100 (Fri, 06 Dec 2013) | 9 lines
  
  Merged revisions 1548496 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1548496 | ay | 2013-12-06 12:58:57 +0100 (Fri, 06 Dec 2013) | 1 line
    
    [CXF-5440] NPE is thrown at http conduit's authorization setting in BP
  ........
  
........


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