Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix TSRM signature - php_stream_stat macro has it's own TSRM
  Regenerate certificates for openssl tests
  Improve test for bug77022

diff --cc ext/openssl/tests/openssl_peer_fingerprint_basic.phpt
Simple merge