Merge pull request #2542 from sleuthkit/develop

.gitignore

.../java/src/org/sleuthkit/datamodel/BlackboardArtifact.java

bindings/java/src/org/sleuthkit/datamodel/Bundle.properties

...java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED

.../java/src/org/sleuthkit/datamodel/HostAddressManager.java

...ings/java/src/org/sleuthkit/datamodel/TaggingManager.java

...s/java/src/org/sleuthkit/datamodel/TimelineEventType.java

...ngs/java/src/org/sleuthkit/datamodel/TimelineManager.java

...java/src/org/sleuthkit/datamodel/WindowsAccountUtils.java

...ings/java/test/org/sleuthkit/datamodel/OsAccountTest.java

tsk/auto/db_sqlite.cpp

tsk/auto/guid.cpp

tsk/auto/guid.h

tsk/fs/apfs.cpp

tsk/fs/apfs_compat.cpp

tsk/fs/apfs_fs.cpp

tsk/fs/ext2fs.c

tsk/fs/fatfs_meta.c

tsk/fs/fs_attr.c

tsk/fs/hfs.c