Added retry options
Change exception handling so that task queue can retry
Merge branch 'master' into Issue2412
Merge pull request #2423 from TEAMMATES/Issue2412

Resend email if an error is encountered while sending the email #2412