Merge change Ia34f0ca9 into eclair-mr2

* changes:
  Fixing database versioning broken for a brief time in CL 32247