Merge branch 'patch-1' into 'master'

RewriteCond: bad flag delimiters

Config error - Apache 2.2 complain "RewriteCond: bad flag delimiters" because the template renders bogus rules without proper new lines like:

` RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/    RewriteCond %{REQUEST_URI} !^/webdav/`

` RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/    RewriteRule ^(.*)$ http://example.com$1 [R=301,NE,L]`

See merge request !456

Author: Till Brehm

server/conf/vhost.conf.master

@@ -416,17 +416,23 @@
 </tmpl_if>
 <tmpl_if name='seo_redirect_enabled'>
 		RewriteCond %{HTTP_HOST} <tmpl_var name='seo_redirect_operator'>^<tmpl_var name='seo_redirect_origin_domain'>$ [NC]
-		<tmpl_if name='apache_version' op='<' value='2.4' format='version'>RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/</tmpl_if>
+		<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
+		RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/
+		</tmpl_if>
 		RewriteRule ^(.*)$ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='seo_redirect_target_domain'>$1 [R=301,NE,L]
 </tmpl_if>
 <tmpl_loop name="alias_seo_redirects">
 		RewriteCond %{HTTP_HOST} <tmpl_var name='alias_seo_redirect_operator'>^<tmpl_var name='alias_seo_redirect_origin_domain'>$ [NC]
-		<tmpl_if name='apache_version' op='<' value='2.4' format='version'>RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/</tmpl_if>
+		<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
+		RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/
+		</tmpl_if>
 		RewriteRule ^(.*)$ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='alias_seo_redirect_target_domain'>$1 [R=301,NE,L]
 </tmpl_loop>
 <tmpl_loop name="redirects">
 		RewriteCond %{HTTP_HOST}   <tmpl_var name='rewrite_domain'>$ [NC]
-		<tmpl_if name='apache_version' op='<' value='2.4' format='version'>RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/</tmpl_if>
+		<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
+		RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/
+		</tmpl_if>
 <tmpl_if name="rewrite_is_url" op="==" value="n">
 		RewriteCond %{REQUEST_URI} !^/webdav/
 		RewriteCond %{REQUEST_URI} !^/php5-fcgi/