Merge branch 'fix/878_web-includes' into staging/fixes

Author: Kristan Kenney

install/deb/apache2/apache2.conf

@@ -80,7 +80,7 @@ LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
 LogFormat "%b" bytes
 
-Include conf.d/
+Include conf.d/*.conf
 IncludeOptional conf.d/domains/*.conf
 
 # Include the virtual host configurations: