Merge branch 'PHP-7.0' into PHP-7.1

diff --cc Zend/zend_portability.h
Simple merge

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

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

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

diff --cc sapi/phpdbg/phpdbg.c
Simple merge

diff --cc sapi/phpdbg/phpdbg.h
Simple merge