LPS-44834 Bug in FileEntry and Folder deletion handling with staging

FYI @sergiogonzalez