Add template variables that were in debian master.cf but not redhat.
Allow having mta send mail directly.
Merge branch 'allow-direct-delivery'
Merge branch 'fix-mastercf-redhat'