Handle DB configuration problems better
Squashed 'core/' changes from 38c4179..635d7bf

635d7bf Merge commit '48039d23b7acd9f66f185c7dd4e972357bd34b88'
48039d2 Squashed 'db/' changes from e37ef46..f90819c

git-subtree-dir: core
git-subtree-split: 635d7bf8dab7daa91e0dde00fe24145e3b0e5d05
Merge commit '6912b840b2f15f9a5dfff6856caba98bf5e2b360'