Minor changes to how tokens are referenced

Conflicts:
	rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
Recording .gitmergeinfo Changes
Fixing build