Merge pull request #2825 from sleuthkit/develop

bindings/java/src/org/sleuthkit/datamodel/AbstractFile.java

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

...java/src/org/sleuthkit/datamodel/CaseDatabaseFactory.java

bindings/java/src/org/sleuthkit/datamodel/DerivedFile.java

bindings/java/src/org/sleuthkit/datamodel/Directory.java

bindings/java/src/org/sleuthkit/datamodel/File.java

bindings/java/src/org/sleuthkit/datamodel/FsContent.java

bindings/java/src/org/sleuthkit/datamodel/LayoutFile.java

bindings/java/src/org/sleuthkit/datamodel/LocalFile.java

bindings/java/src/org/sleuthkit/datamodel/SlackFile.java

bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java

...gs/java/src/org/sleuthkit/datamodel/SpecialDirectory.java

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

bindings/java/src/org/sleuthkit/datamodel/TskData.java