Merge branch 'master' into 'stable-3.1'

Comments out special handling for reloading PHP-FPM on CentOS7, refs #3739

As per #3739 and #3816 , comment out special handling for PHP-FPM reloading on CentOS7, allowing multiple FPM processes to co-exist.

See merge request !306

Author: Till Brehm

server/mods-available/web_module.inc.php

@@ -269,13 +269,15 @@ function restartPHP_FPM($action = 'restart') {
 						$initcommand = '/sbin/start-stop-daemon --stop --signal USR2 --quiet --pidfile /var/run/php5-fpm.pid --name php5-fpm';
 					}
 					// And the next workaround, php-fpm reloads in centos 7 downt work as well.
+                                        /*
 					if(preg_match('/^ID=centos/m', $tmp) && preg_match('/^VERSION_ID="7"/m', $tmp)) {
 						$initcommand = 'systemctl restart php-fpm.service';
 					}
+                                        */
 					unset($tmp);
 				}	
 			}
-			
+			/*
 			if($action == 'reload') {
 				// And the next workaround, php-fpm reloads in centos 7 downt work as well.
 				if(file_exists('/etc/os-release')) {
@@ -287,6 +289,7 @@ function restartPHP_FPM($action = 'restart') {
 					unset($tmp);
 				}
 			}
+                        */
 		}
 
 		$retval = array('output' => '', 'retval' => 0);