Merge branch 'master' into 'master'
improved nginx http to https redirect "if" constructions in nginx should be used only if no other solution is possible, because "if" is the slowest directive and adds performance penalties (["If is Evil"](https://www.nginx.com/resources/wiki/start/topics/depth/ifisevil/)). This merge request is supposed to improve this issue and adds another "server" block instead of using "if" directive. This is a "standard" approach which is widely used in nginx configurations for http->https redirections. All other functionality and features of ISPConfig are preserved. Closes #2209 (redirection without "if" directive) Closes #3118 (the "split" is achieved using "server" blocks without "if" directive) See merge request !578