Modifies email template to contain references to the merchant in both subject and body.  [Fixes #84637622]