DBD - when connecting make sure we wait MessageTimeout + 5 since the
timeout when talking to the Database is the same timeout so a race
condition could occur in the requesting client when receiving the response
if the database is unresponsive.
Minor formatting fixes
Slightly better code in reference to 52015d6e8cdef613e48c126cb11cd4c8c6b31572