Merge pull request #2593 from APriestman/mergeOct26

bindings/java/build.xml

bindings/java/doxygen/Doxyfile

bindings/java/doxygen/artifact_catalog.dox

bindings/java/doxygen/blackboard.dox

bindings/java/jni/auto_db_java.cpp

bindings/java/jni/auto_db_java.h

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

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

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

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

...java/src/org/sleuthkit/datamodel/BlackboardAttribute.java

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

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

...ngs/java/src/org/sleuthkit/datamodel/Bundle_ja.properties

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

...va/src/org/sleuthkit/datamodel/CommunicationsManager.java

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

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

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

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