CMS-4197 Remove ModuleName from PageTemplateKey