Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Do not set PR_SET_DUMPABLE by default
  Do not set PR_SET_DUMPABLE by default

diff --cc sapi/fpm/fpm/fpm_conf.c
Simple merge

diff --cc sapi/fpm/fpm/fpm_conf.h
Simple merge

diff --cc sapi/fpm/www.conf.in
Simple merge