Merge branch 'stable-3.1'

Author: Marius Burkard

install/tpl/apache_ispconfig.conf.master

@@ -119,6 +119,14 @@ Alias /awstats-icon "/usr/share/awstats/icon"
 </tmpl_if>
 
 Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme-challenge
+<Directory /usr/local/ispconfig/interface/acme-challenge>
+		<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
+		Require all granted
+		<tmpl_else>
+        Order allow,deny
+        Allow from all
+		</tmpl_if>
+</Directory>
 
 NameVirtualHost *:80
 NameVirtualHost *:443