Fix #66021 (Blank line inside empty array/object)

Changed json_encode() so that when the JSON_PRETTY_PRINT option is specified,
the pair of linefeeds immediately after an opening bracket and before the
corresponding closing bracket is omitted when the array or object contains no
elements or accessible properties (and hence would have a blank line between
the brackets).
Cleanup $ is not needed for git
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Cleanup $ is not needed for git
Fixed bug #66967 Updated the bundled libsqlite to 3.8.4.3
Made usage of php_hash_environment useful by updating instead of just adding argc
Merge branch 'PHP-5.4' into PHP-5.5
fix typo
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix typo
Fix bug #67064 in a BC safe way
You can use an optional parameter now when implementing the Countable interface
to get the $mode passed to count().
Merge branch 'PHP-5.4' into PHP-5.5
Updated NEWS
Forgot title in phpt for bug #67064
Merge branch 'PHP-5.4' into PHP-5.5
Reverted to 5a0da281e5a9fa02db18b4822d8b103c65849fa9
Discussion: http://news.php.net/php.cvs/76836
Merge branch 'PHP-5.4' into PHP-5.5
Fixed bug #67024 - getimagesize should recognize BMP files with negative height
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height
fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
Fix bug #66721

Add NULL check to php_date_parse_tzfile's retval