Fixed typo in UPGRADING and modified php.ini-* description for encoding related changes
Merge branch 'PHP-5.6'

* PHP-5.6:
 Modified php.ini-* description for encoding related changes