Merge branch 'master' of github.com:sleuthkit/sleuthkit

bindings/java/test/org/sleuthkit/datamodel/BottomUpTest.java

...s/java/test/org/sleuthkit/datamodel/CPPtoJavaCompare.java

bindings/java/test/org/sleuthkit/datamodel/CrossCompare.java

...java/test/org/sleuthkit/datamodel/DataModelTestSuite.java

bindings/java/test/org/sleuthkit/datamodel/ImgTraverser.java

...ava/test/org/sleuthkit/datamodel/SequentialTraversal.java

tsk/fs/dcalc_lib.c

tsk/fs/dstat_lib.c

tsk/fs/ext2fs.c

tsk/fs/ext2fs_dent.c

tsk/fs/ext2fs_journal.c

tsk/fs/fatfs.c

tsk/fs/ffind_lib.c

tsk/fs/ffs.c

tsk/fs/ffs_dent.c

tsk/fs/fs_attr.c

tsk/fs/fs_block.c

tsk/fs/fs_dir.c

tsk/fs/fs_name.c

tsk/fs/fs_open.c