Merge "(bug 16020) Fix race condition in User::addToDatabase()"