Merge change 9671

* changes:
  Fixing db versioning which got messed up a bit between donut and master.