allow better control over WS-FED principal resolver

# Conflicts:
#	cas-server-core-authentication/src/main/java/org/jasig/cas/authentication/principal/PersonDirectoryPrincipalResolver.java
#	cas-server-support-wsfederation/src/main/java/org/jasig/cas/support/wsfederation/web/flow/WsFederationAction.java

cas-server-support-wsfederation/src/main/java/org/jasig/cas/support/wsfederation/web/flow/WsFederationAction.java

@@ -130,16 +130,16 @@ protected Event doExecute(final RequestContext context) throws Exception {
                     restoreRequestAttribute(request, session, LOCALE);
                     restoreRequestAttribute(request, session, METHOD);
 
-                    final AuthenticationResult authenticationResult =
-                            this.authenticationSystemSupport.handleAndFinalizeSingleAuthenticationTransaction(service, credential);
+                    final AuthenticationContextBuilder builder = new DefaultAuthenticationContextBuilder(
+                            this.authenticationSystemSupport.getPrincipalElectionStrategy());
                         final AuthenticationTransaction transaction =
                                 AuthenticationTransaction.wrap(credential);
                         this.authenticationSystemSupport.getAuthenticationTransactionManager()
                                 .handle(transaction,  builder);
                         final AuthenticationContext authenticationContext = builder.build(service);
 
                     WebUtils.putTicketGrantingTicketInScopes(context,
-                            this.centralAuthenticationService.createTicketGrantingTicket(authenticationResult));
+                            this.centralAuthenticationService.createTicketGrantingTicket(authenticationContext));
 
                     logger.info("Token validated and new {} created: {}", credential.getClass().getName(), credential);
                     return success();