Merge change I6430912f into eclair-mr2

* changes:
  New constants for db upgrade.