am f9b97e69: am fef18bfc: resolved conflicts for merge of 383aa124 to eclair-mr2

Merge commit 'f9b97e6941d5162f676631ffda15eff3d20f3b18'

* commit 'f9b97e6941d5162f676631ffda15eff3d20f3b18':
  fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange