CMS-2192 Templates API design.
Simplified templates and components by leaving just one single config.
Merge branch 'master' into CMS-2253