Merge https://github.com/tmciver-basis/sleuthkit
Merge branch 'file-carving' of https://github.com/tmciver-basis/sleuthkit into file-carving
Merge branch 'file-carving' of https://github.com/tmciver-basis/sleuthkit into file-carving
fix unchecked warn
jni datamodel: fix for layout files can have children (derived files)
Merge branch 'file-carving' of https://github.com/tmciver-basis/sleuthkit into file-carving
Merge branch 'master' of https://github.com/sleuthkit/sleuthkit into file-carving
Merge branch 'master' of https://github.com/sleuthkit/sleuthkit
Merge branch 'file-carving'
Revert "Handle the case in getRootDirectory() when root dir has additional meta . and .. entries."

This reverts commit 701dc1279e0b9f49b70ede70063efe949fc19dde.
Merge branch 'master' of https://github.com/adam-m/sleuthkit