CMS-4061 Remove Site Template - Add moduleconfig to content-type system.site
Minor renaming