RED-7384-fp
master
* fix test
* index files from trash aswell * merge manual local entries with existing ones during unprocessed changes merge * don't add ManualRedactionEntries on local changes for Images