Fix configuring database options from manifest

The merge was incorrectly overwriting default db options. This fixes it.