Added Support to CORE-1132(Update Email Templates for 6.4)