commented and rearranged dbd.conf, as well as merging in the old dbd-common.conf