Replace fastcgi_pass unix:/var/run/php5-fpm.sock; with fastcgi_pass unix:{fpm_socket}; in phpmyadmin and squirrelmail blocks, as they are considered apps and should use the same (apps.sock) listener.

Adding SSLStaplingCache shmcb:/var/run/ocsp(128000) to vhost template conf if apache version >= 2.4 and ssl enabled

- backported patches

- added intermediate SSL security profile (see https://mozilla.github.io/server-side-tls/ssl-config-generator/)
- TODO: admin option to choose between intermediate (default) and modern

see:
- http://git.ispconfig.org/panders/ispconfig3/commit/f7ec00b2f8ba3efc5bdeacef9c813f8a826ae3be#note_454

- http://en.wikipedia.org/wiki/SPDY

Note: The mod_proxy_fcgi that ships with CentOS and Ubuntu does not support sockets yet, so all php-fpm connections are done by IP.

- changed hhvm handling to match stable branch (FilesMatch in Directory sections) - added changes from stable accordingly

Revert "Fixed: FS#3581 - Website unaccessible under some circumstances when using seo redirection *.domain to www.domain"

This reverts commit 5742e4c9.

Fixed: FS#3581 - Website unaccessible under some circumstances when using seo redirection *.domain to www.domain
(only for apache2, nginx still to do)

- Changed vhost.conf.master as php-fpm was not working after commit "5a6670bd".

- fixed vhost template. website settings were overriding handlers of apache config files, e. g. roundcube