CRM-14830 - Email tpl cleanup and removed unused function
Merge pull request #3862 from colemanw/CRM-14830

CRM-14830 - Email tpl cleanup and removed unused function