Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  Fixed a wrong test
Fixed opcahce_reset() crash when opcache.protect_memory is set
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed opcahce_reset() crash when opcache.protect_memory is set