Reorganize Discover task to support incremental archiving and so it does not fail when elasticsearch is down
Merge remote-tracking branch 'origin/master'