Revoke tokens on user delete (bug 1166670)

Change-Id: I8dacf71b43cffc12439520e05918729e385cb60a
Merge "Revoke tokens on user delete (bug 1166670)" into stable/folsom