More fixes related to LDAP usernames which don't match primary
MyTardis usernames, when using linked accounts.
Merge pull request #2 from wettenhj/master

More fixes related to MyTardis linked accounts