Merge pull request #394 from CruGlobal/MH-1056

Change sender value in CRS mailer
Fix test errors
Merge branch 'MH-1056' into dev