Fix conditions for sending mails.
Merge branch 'deif-add-separate-approval-mail-setting' into deploy