Merge "Remove unused key enotif_mailer"