Merge branch 'stable-3.1'

Author: Marius Burkard

install/dist/conf/centos70.conf.php

@@ -144,7 +144,7 @@
 
 //* Amavisd
 $conf['amavis']['installed'] = false; // will be detected automatically during installation
-$conf['amavis']['config_dir'] = '/etc';
+$conf['amavis']['config_dir'] = '/etc/amavisd';
 $conf['amavis']['init_script'] = 'amavisd';
 
 //* ClamAV