Comment 2 for bug 1286157

Additional task - need some upgrade testing to ensure users migrating from password-> trusts will work, the code should just use whatever is stored in user_creds but needs ideally a new test to prove all works as expected.