Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix php-fpm.service.in

diff --cc sapi/fpm/php-fpm.service.in
index e2c807426b4c9658343fd63510a0e74644e8c6c9,c135f04c2706f3035d18c38c259d253aac5cb5f6..a4d533c1972e28e717f39cbe2d3c168c153eccff
--- 1/sapi/fpm/php-fpm.service.in
--- 2/sapi/fpm/php-fpm.service.in
+++ b/sapi/fpm/php-fpm.service.in
@@@ -1,17 -1,12 +1,17 @@@
 +# It's not recommended to modify this file in-place, because it
 +# will be overwritten during upgrades.  If you want to customize,
 +# the best way is to use the "systemctl edit" command.
 +
  [Unit]
  Description=The PHP FastCGI Process Manager
- After=syslog.target network.target
+ After=network.target
  
  [Service]
  Type=@php_fpm_systemd@
- PIDFile=@localstatedir@/run/php-fpm.pid
- ExecStart=@sbindir@/php-fpm --nodaemonize --fpm-config @sysconfdir@/php-fpm.conf
+ PIDFile=@EXPANDED_LOCALSTATEDIR@/run/php-fpm.pid
+ ExecStart=@EXPANDED_SBINDIR@/php-fpm --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf
  ExecReload=/bin/kill -USR2 $MAINPID
 +PrivateTmp=true
  
  [Install]
  WantedBy=multi-user.target