Merge change 20051

* changes:
  Fix error in settings.db upgrader.  See bug 1999477 for details.