merge from develop

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

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

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

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

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

db_diff/tskdbdiff.py