Fixing a SAML SSO validation issue

Conflicts:
	systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
	systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl
Recording .gitmergeinfo Changes
Fixing build