Merge "Defend against missing DB during migration." into jb-ub-now-kermit