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

........
  r1522917 | coheigea | 2013-09-13 14:31:53 +0100 (Fri, 13 Sep 2013) | 6 lines

  [CXF-5277] - "ConditionsProvider receives limited information from SAMLTokenRenewer"

  Conflicts:
  	services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java

........

git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes@1522931 13f79535-47bb-0310-9956-ffa450edef68
Recording revisions 1522917,1522928 via  git from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes



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