Merge "(bug 40302) Lock user table with LOCK TABLES"