Corrected patch for bug #60616

For unixODBC, use ODBC version as defined by it (as of v2.2.14 it is 3.5).
This allows us to use newer features like SQL_DESC_OCTET_LENGTH (which
returns the number of bytes required to store the data). This fixes the issue
in #60616. If the newer version is not available, over-allocate to accomodate
4-byte Unicode characters for CHAR and VARCHAR datatypes (and their Wide
counterparts).
version.
Fixed a couple of failing tests.
Undo inadvertent commit of php_version
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Undo inadvertent commit of php_version
  Corrected patch for bug #60616
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Undo inadvertent commit of php_version
  Corrected patch for bug #60616
Merge branch 'PHP-5.6'

* PHP-5.6:
  Undo inadvertent commit of php_version
  Corrected patch for bug #60616
Merge branch 'master' of git://github.com/php/php-src