am 947ef4e7: am 7a9cda18: Merge "Defend against missing DB during migration." into jb-ub-now-kermit

* commit '947ef4e7ab4cc303fc708ee45a241969ca7ebbdc':
  Defend against missing DB during migration.