FileTypeID module: thread-safety tweak and comments
made FileExtMismatchXML.getDefault() synchronized
Merge remote-tracking branch 'upstream/develop' into mt-3rdparty
Merge remote-tracking branch 'upstream/develop' into mt-3rdparty
updated FileTypeIdIngestModule to keep track of total time and file count for all modules per job, not all jobs combined together
Fixing an issue with testing where the test will try to generate reports too early.
Merge remote-tracking branch 'upstream/develop' into mt-3rdparty
Fixed some thread-safety issues in ScalpelCarver.
Removed some unused imports.
Added some missing access specifiers in KeywordSearch.
Restored default disabling of some of the standard keyword lists
Merge pull request #638 from rcordovano/keyword_search_options_fix

Restored default disabling of some of the standard keyword lists
Merge pull request #635 from alexjacks92/testScriptFix

Testing Fixes - smarter diffing without object ids, and test report generation timing fix
Merge pull request #637 from SynapticNulship/mt-3rdparty

thread-safety tweaks
Added NON-NLS tag to lines containing hardcoded strings that do not need National Language Support (NLS).
Merge pull request #639 from mrtizmo/actions

Added NON-NLS tag to lines containing hardcoded strings that do not need...
Merge remote-tracking branch 'upstream/develop' into develop