[PATCH - resend] [PUSHED] Some more work for --disable-database-connectivity

[Tor Lillqvist]

> resending this since i haven't heard back from you.

I was on vacation for a few days.

Thanks, pushed to master.

--tml