Jira MAR-1592 Made various changes to the MailService to test parameteri...

...zation of the Send Mail data.