CORE-4066: finished migrating and updating the template JSON format