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

........
  r1533424 | coheigea | 2013-10-18 13:47:24 +0100 (Fri, 18 Oct 2013) | 6 lines

  Fixed an error when trying to cancel a token

  Conflicts:
  	rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java

........

git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes@1533475 13f79535-47bb-0310-9956-ffa450edef68
Partially fixing SecureConversation cancelling functionality


Conflicts:
	rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java

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