CMS-2638 Remove gurba id from content name for new content
Rolled back changes from previous commit that undid needed changes for this task.