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