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

........
  r1548497 | ay | 2013-12-06 13:01:55 +0100 (Fri, 06 Dec 2013) | 10 lines

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

  ........
    r1548496 | ay | 2013-12-06 12:58:57 +0100 (Fri, 06 Dec 2013) | 2 lines

    [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@1548654 13f79535-47bb-0310-9956-ffa450edef68