Merge branch 'PHP-7.1' into PHP-7.2

diff --cc ext/mysqlnd/mysqlnd_connection.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_enum_n_def.h
Simple merge

diff --cc ext/mysqlnd/mysqlnd_wireprotocol.c
Simple merge