Update Zend_Locale_Format to the latest Zend version
Use php.internal_encoding instead of iconv.internal_encoding in PHP 5.6+
Merge pull request #3155 from simonwelsh/iconv_changes

Only use iconv.internal_encoding in PHP<5.6