PLFM-1760 Replace entity name with entity id for entities in the trash can to avoid name conflict
PLFM-1760 Code review adjustments
Merge pull request #321 from eric-wu/develop

PLFM-1760 Replace entity name with entity id for entities in the trash c...