Merge remote-tracking branch 'origin/master' into native-tls

* origin/master:
  made the apache ini holders to be zend_bool
  Removed useless local variable
  Use simpler functions
  Fixed test
  small fixes to UPGRADING
  Reorder to save alignment size (of course, only for common used structs)

diff --cc Zend/zend_execute_API.c
Simple merge

diff --cc Zend/zend_objects.c
Simple merge

diff --cc Zend/zend_vm_def.h
Simple merge

diff --cc Zend/zend_vm_execute.h
Simple merge

diff --cc main/php_streams.h
Simple merge

diff --cc sapi/apache2handler/php_apache.h
Simple merge

diff --cc sapi/apache2handler/php_functions.c
Simple merge