WF-17: Fix missing deadline substitution variable from emails
Merge branch 'staging'