Merge branch 'upstream' into rebase_489

Merge branch 'upstream' into rebase_489

Debian upstream config for exim 4.89

Conflicts:
	conf.d/acl/20_exim4-config_local_deny_exceptions
	conf.d/acl/30_exim4-config_check_mail
	conf.d/acl/30_exim4-config_check_rcpt
	conf.d/auth/30_exim4-config_examples
	conf.d/main/01_exim4-config_listmacrosdefs
	conf.d/main/02_exim4-config_options
	conf.d/main/03_exim4-config_tlsoptions
	conf.d/retry/30_exim4-config
	conf.d/router/300_exim4-config_real_local
	conf.d/router/400_exim4-config_system_aliases
	conf.d/router/600_exim4-config_userforward
	conf.d/router/850_exim4-config_lowuid
	conf.d/router/900_exim4-config_local_user
	conf.d/transport/30_exim4-config_address_pipe
	conf.d/transport/30_exim4-config_maildir_home
	conf.d/transport/30_exim4-config_remote_smtp
	conf.d/transport/30_exim4-config_remote_smtp_smarthost
	conf.d/transport/35_exim4-config_address_directory
	update-exim4.conf.conf