Fixes from RT 58813

Add support for File based DBD files.