Remove use of depreciated AppConfig
Merge branch 'mailer-env-variables'