Merge change 24464 into eclair

* changes:
  Fix for bug # 2023074: settings db updater broken at version 34.