Merge pull request #6144 from leoetlino/nand-import-fix NANDImporter: Add support for dumps that don't include keys
