Removing existing diff files before writing them out to the jenkins attachment location.
Merge branch 'develop' of https://www.github.com/sleuthkit/autopsy into develop
Cleaning up code to work when you aren't running a jenkins job.
IngestModuleAdapter now has a static moduleRefCount and static methods to access it.
Merge remote-tracking branch 'upstream/develop' into onemsg2
Adding the missing bundle properties to this branch since my pull request to develop is still waiting.
The renamed prop.
Merge branch 'mt-search2' into onemsg2

Conflicts:
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
ingestStatus is now static and shared between all threads
Just do one summary postMessage for KeywordSearch module.
renaming
HashDB module: only post error messages once per job
KeywordSearch: check the server and existence of keywords only once per job
remove unused messageId var
multithreading updates for ExifParserFileIngestModule
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
FileExtMismatchIngestModule: only send one final message
FileTypeIdIngestModule: only send one final message
SevenZipIngestModule: only check 7zip init once
made a string final