Fix file delete, if entity doesn't exist.
Merge branch 'SCHOLAR-3.x' into file-delete
Merge pull request #2492 from openscholar/file-delete

Fix file delete, if entity doesn't exist.