Merge branch 'patch-3' into 'master'

Patch 3

See merge request ispconfig/ispconfig3!837

Author: Marius Burkard

install/tpl/nginx_ispconfig.vhost.master

@@ -1,7 +1,7 @@
 server {
-        listen {vhost_port};
-        listen [::]:{vhost_port} ipv6only=on;
-		ssl {ssl_on};
+        listen {vhost_port}{ssl_on};
+        listen [::]:{vhost_port} ipv6only=on{ssl_on};
+        
 		{ssl_comment}ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
         {ssl_comment}ssl_certificate /usr/local/ispconfig/interface/ssl/ispserver.crt;
         {ssl_comment}ssl_certificate_key /usr/local/ispconfig/interface/ssl/ispserver.key;