CMS-2889 Remove Module version and SiteTemplateKey from TemplateKey