Merge remote-tracking branch 'upstream/develop' into 5702_fixBuild

.travis.yml

Makefile.am

NEWS.txt

bindings/java/build.xml

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

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

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

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

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

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

...rg/sleuthkit/datamodel/TimelineEventArtifactTypeImpl.java

...src/org/sleuthkit/datamodel/TimelineEventDescription.java

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

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

.../java/src/org/sleuthkit/datamodel/TimelineEventTypes.java

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

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

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

...euthkit/datamodel/blackboardutils/ArtifactHelperBase.java

.../sleuthkit/datamodel/blackboardutils/ArtifactsHelper.java