Consolidating Kerberos + SPNEGO code


Conflicts:
	src/main/java/org/apache/ws/security/spnego/SpnegoTokenContext.java
	src/main/java/org/apache/ws/security/validate/KerberosTokenValidator.java
	ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/KerberosServiceSecurityTokenImpl.java

git-svn-id: https://svn.apache.org/repos/asf/webservices/wss4j/branches/1_6_x-fixes@1622474 13f79535-47bb-0310-9956-ffa450edef68