Merge "Fix declaration of ForeignDBFile::delete()"