Ensure that DB configuration is backward compatible

Fixes bug 1193557

Change-Id: I483099b205c71d66cf97522307d8265abe83a488