Merge branch 'PHP-7.1'

* PHP-7.1:
  merge PR #2290: enable opcache in CLI in 7.1+

diff --cc ext/opcache/zend_accelerator_module.c
Simple merge

diff --cc php.ini-development
Simple merge

diff --cc php.ini-production
Simple merge