Merge branch 'PHP-7.1'

diff --cc ext/openssl/openssl.c
Simple merge

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

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