am e57045a9: (-s ours) DO NOT MERGE Port DB upgrades from master.

* commit 'e57045a9b0034063e14ea34b6574b0b0f9fc8998':
  DO NOT MERGE Port DB upgrades from master.