Pass user token to Bango (bug 877923)
uuid > int (bug 879852)
Merge branch 'user-uuid'
clear up race condition for was_locked (bug 88013)