MT#5879 Changes related to invoice email template.