fixes #6593 tokens in plain text email
refs #6564 email received report
fixes #6560 refine logging tables and triggers
Merge branch 'dev' into test