MODE-2302 Added upgrade function for the new trash file format and fixed reported logging issues.
Merge pull request #1264 from hchiorean/MODE-2302

MODE-2302 Added upgrade function for the new trash file format and fixed reported logging issues.