Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Added execution time criterion to ingest module process terminators
added ability to specify time out per process
Merge remote-tracking branch 'upstream/develop' into develop
update ImageAnalyzer to new API of ControlsFX 8.20.8
Merge remote-tracking branch 'upstream/develop' into imageanalyzer_u20
Merge pull request #949 from millmanorama/imageanalyzer_u20

Imageanalyzer u20
Support for timed process terminator
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into timed_proc_termination
Moved TimedProcessTerminator to ExecUtil class. Addressed other comments
Merge pull request #951 from eugene7646/timed_proc_termination

Timed process termination
Complete first draft of ingest job config refactor
Continue refactoring of ingest job configuration
Complete ingest job configurator refactor
Merge pull request #958 from rcordovano/ingest_job_configurator_refactor

Ingest job configurator refactor
Update Photorec XML parsing to use built-in parser
Update Photorec XML parsing to clip paths from filenames