Further optimize User::saveOptions() by doing deletes by PRIMARY KEY

* We do not care about gap locks here, just as in the case
  with new users. Races should be rare and are simply FWW.

Change-Id: Ie483a2d5df501619acbd868bf894dfc6c911a753
Merge "Further optimize User::saveOptions() by doing deletes by PRIMARY KEY"