Adjusted deleted condition in entity query for validating restoration, and...

Kurt Trowbridgerequested to merge
issue/trash-3576065:3576065-unable-to-restore into 3.x

Adjusted deleted condition in entity query for validating restoration, and added alias restoration to preTrashRestore()

Closes #3576065

Merge request reports