made lsapi_main.c compatible with PHP7/phpng .
made lsapi_main.c compatible with PHP7/phpng .
made lsapi_main.c compatible with PHP7/phpng .
made lsapi_main.c compatible with PHP7/phpng .

Conflicts:
	sapi/litespeed/lsapi_main.c
Merge branch 'master' of git.php.net:php-src
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'
Fixed bug #68391 Returns the pool config files in order

Fixes https://bugs.php.net/bug.php?id=68391
NEWS
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  Fixed bug #68391 Returns the pool config files in order
NEWS
add test for #68391
Merge branch 'PHP-5.6'

* PHP-5.6:
  add test for #68391
  NEWS
  NEWS
  Fixed bug #68391 Returns the pool config files in order
Change pm.start_servers default warning to notice

Unlike other settings, this has a perfectly reasonable default, calculated using
a dynamic formula. If the default was hardcoded to "2" or something, then it
would make sense to have a warning, since that could potentially be bad, but for
a dynamically calculated value based on other mandatory settings, a notice ought
to be enough.
move zlog_set_level() again

from fpm_unix_init_main() to fpm_conf_post_process() this time (see #894),
because otherwise nothing in fpm_conf_init_main() obeys log levels
NEWS
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  move zlog_set_level() again
  Change pm.start_servers default warning to notice