OOIION-1817: Fix load_datastore of DirEntry
Merge pull request #495 from mmeisinger/fix1817_load

OOIION-1817: Fix load_datastore of DirEntry