Fix JAAS controller selection when token auth succeeds
Fix JAAS controller selection when token auth succeeds

This only comes in to play if there is already an existing controller
entry for JAAS which is named something other than 'jaas' and the user
is authenticated with the IDM but not the controller (i.e., macaroon
discharge can happen automatically).

ubuntu/conjure-up,conjure-up/conjure-up,Ubuntu-Solutions-Engineering/conjure,Ubuntu-Solutions-Engineering/conjure,conjure-up/conjure-up,ubuntu/conjure-up