allow null names and content types
Merge pull request #320 from john-hill/PLFM-1743

allow null names and content types
Merge pull request #321 from eric-wu/develop

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