Prepare release
Prepare release
Fix log-json tests on HHVM nightlies

```
[fredemmott@devbig076 ~/fio/phpunit] hhvm ./phpunit
tests/TextUI/log-json-pre-66021.phpt
PHPUnit 4.3-gbf93bc2 by Sebastian Bergmann.

Configuration read from /data/fio/phpunit/phpunit.xml.dist

S

Time: 1.29 seconds, Memory: 0.00Mb

There was 1 skipped test:

1) tests/TextUI/log-json-pre-66021.phpt
PHP 5.4.(0-27) or PHP 5.5.(0-11) or PHP 5.6.(0alpha1-0beta1) or HHVM <
3.2 required

/data/fio/phpunit/src/Extensions/PhptTestCase.php:156
/data/fio/phpunit/src/Framework/TestSuite.php:675
/data/fio/phpunit/src/TextUI/TestRunner.php:427
/data/fio/phpunit/src/TextUI/Command.php:186
/data/fio/phpunit/src/TextUI/Command.php:138

OK, but incomplete, skipped, or risky tests!
Tests: 1, Assertions: 1, Skipped: 1.

Generating code coverage report in HTML format ...^C
[fredemmott@devbig076 ~/fio/phpunit] hhvm ./phpunit
tests/TextUI/log-json-post-66021.phpt
PHPUnit 4.3-gbf93bc2 by Sebastian Bergmann.

Configuration read from /data/fio/phpunit/phpunit.xml.dist

.

Time: 21.25 seconds, Memory: 0.14Mb

OK (1 test, 1 assertion)

Generating code coverage report in HTML format ...^C
[fredemmott@devbig076 ~/fio/phpunit] php5 --version
PHP 5.5.7 (cli) (built: Jan 23 2014 15:45:09)
Copyright (c) 1997-2013 The PHP Group
Zend Engine v2.5.0, Copyright (c) 1998-2013 Zend Technologies
[fredemmott@devbig076 ~/fio/phpunit] php5 ./phpunit
tests/TextUI/log-json-pre-66021.phpt
PHPUnit 4.3-gbf93bc2 by Sebastian Bergmann.

Configuration read from /data/fio/phpunit/phpunit.xml.dist

The Xdebug extension is not loaded. No code coverage will be generated.

.

Time: 134 ms, Memory: 2.25Mb

OK (1 test, 1 assertion)
[fredemmott@devbig076 ~/fio/phpunit] php5 ./phpunit
tests/TextUI/log-json-post-66021.phpt
PHPUnit 4.3-gbf93bc2 by Sebastian Bergmann.

Configuration read from /data/fio/phpunit/phpunit.xml.dist

The Xdebug extension is not loaded. No code coverage will be generated.

S

Time: 56 ms, Memory: 2.00Mb

There was 1 skipped test:

1) tests/TextUI/log-json-post-66021.phpt
PHP 5.4.(28+) or PHP 5.5.(12+) or PHP 5.6.0beta2+ or HHVM 3.(2+)
required

/data/fio/phpunit/src/Extensions/PhptTestCase.php:156
/data/fio/phpunit/src/Framework/TestSuite.php:675
/data/fio/phpunit/src/TextUI/TestRunner.php:427
/data/fio/phpunit/src/TextUI/Command.php:186
/data/fio/phpunit/src/TextUI/Command.php:138

OK, but incomplete, skipped, or risky tests!
Tests: 1, Assertions: 1, Skipped: 1.
[fredemmott@devbig076 ~/fio/phpunit]
```
Merge pull request #1288 from fredemmott/json-test-on-latest-hhvm

Fix log-json tests on HHVM nightlies
Fix log-json tests on HHVM nightlies

```
[fredemmott@devbig076 ~/fio/phpunit] hhvm ./phpunit
tests/TextUI/log-json-pre-66021.phpt
PHPUnit 4.3-gbf93bc2 by Sebastian Bergmann.

Configuration read from /data/fio/phpunit/phpunit.xml.dist

S

Time: 1.29 seconds, Memory: 0.00Mb

There was 1 skipped test:

1) tests/TextUI/log-json-pre-66021.phpt
PHP 5.4.(0-27) or PHP 5.5.(0-11) or PHP 5.6.(0alpha1-0beta1) or HHVM <
3.2 required

/data/fio/phpunit/src/Extensions/PhptTestCase.php:156
/data/fio/phpunit/src/Framework/TestSuite.php:675
/data/fio/phpunit/src/TextUI/TestRunner.php:427
/data/fio/phpunit/src/TextUI/Command.php:186
/data/fio/phpunit/src/TextUI/Command.php:138

OK, but incomplete, skipped, or risky tests!
Tests: 1, Assertions: 1, Skipped: 1.

Generating code coverage report in HTML format ...^C
[fredemmott@devbig076 ~/fio/phpunit] hhvm ./phpunit
tests/TextUI/log-json-post-66021.phpt
PHPUnit 4.3-gbf93bc2 by Sebastian Bergmann.

Configuration read from /data/fio/phpunit/phpunit.xml.dist

.

Time: 21.25 seconds, Memory: 0.14Mb

OK (1 test, 1 assertion)

Generating code coverage report in HTML format ...^C
[fredemmott@devbig076 ~/fio/phpunit] php5 --version
PHP 5.5.7 (cli) (built: Jan 23 2014 15:45:09)
Copyright (c) 1997-2013 The PHP Group
Zend Engine v2.5.0, Copyright (c) 1998-2013 Zend Technologies
[fredemmott@devbig076 ~/fio/phpunit] php5 ./phpunit
tests/TextUI/log-json-pre-66021.phpt
PHPUnit 4.3-gbf93bc2 by Sebastian Bergmann.

Configuration read from /data/fio/phpunit/phpunit.xml.dist

The Xdebug extension is not loaded. No code coverage will be generated.

.

Time: 134 ms, Memory: 2.25Mb

OK (1 test, 1 assertion)
[fredemmott@devbig076 ~/fio/phpunit] php5 ./phpunit
tests/TextUI/log-json-post-66021.phpt
PHPUnit 4.3-gbf93bc2 by Sebastian Bergmann.

Configuration read from /data/fio/phpunit/phpunit.xml.dist

The Xdebug extension is not loaded. No code coverage will be generated.

S

Time: 56 ms, Memory: 2.00Mb

There was 1 skipped test:

1) tests/TextUI/log-json-post-66021.phpt
PHP 5.4.(28+) or PHP 5.5.(12+) or PHP 5.6.0beta2+ or HHVM 3.(2+)
required

/data/fio/phpunit/src/Extensions/PhptTestCase.php:156
/data/fio/phpunit/src/Framework/TestSuite.php:675
/data/fio/phpunit/src/TextUI/TestRunner.php:427
/data/fio/phpunit/src/TextUI/Command.php:186
/data/fio/phpunit/src/TextUI/Command.php:138

OK, but incomplete, skipped, or risky tests!
Tests: 1, Assertions: 1, Skipped: 1.
[fredemmott@devbig076 ~/fio/phpunit]
```

(cherry picked from commit 8fdf5ff0df202957eca6c1d875138c6e48108c17)
Fix log-json tests on HHVM nightlies

```
[fredemmott@devbig076 ~/fio/phpunit] hhvm ./phpunit
tests/TextUI/log-json-pre-66021.phpt
PHPUnit 4.3-gbf93bc2 by Sebastian Bergmann.

Configuration read from /data/fio/phpunit/phpunit.xml.dist

S

Time: 1.29 seconds, Memory: 0.00Mb

There was 1 skipped test:

1) tests/TextUI/log-json-pre-66021.phpt
PHP 5.4.(0-27) or PHP 5.5.(0-11) or PHP 5.6.(0alpha1-0beta1) or HHVM <
3.2 required

/data/fio/phpunit/src/Extensions/PhptTestCase.php:156
/data/fio/phpunit/src/Framework/TestSuite.php:675
/data/fio/phpunit/src/TextUI/TestRunner.php:427
/data/fio/phpunit/src/TextUI/Command.php:186
/data/fio/phpunit/src/TextUI/Command.php:138

OK, but incomplete, skipped, or risky tests!
Tests: 1, Assertions: 1, Skipped: 1.

Generating code coverage report in HTML format ...^C
[fredemmott@devbig076 ~/fio/phpunit] hhvm ./phpunit
tests/TextUI/log-json-post-66021.phpt
PHPUnit 4.3-gbf93bc2 by Sebastian Bergmann.

Configuration read from /data/fio/phpunit/phpunit.xml.dist

.

Time: 21.25 seconds, Memory: 0.14Mb

OK (1 test, 1 assertion)

Generating code coverage report in HTML format ...^C
[fredemmott@devbig076 ~/fio/phpunit] php5 --version
PHP 5.5.7 (cli) (built: Jan 23 2014 15:45:09)
Copyright (c) 1997-2013 The PHP Group
Zend Engine v2.5.0, Copyright (c) 1998-2013 Zend Technologies
[fredemmott@devbig076 ~/fio/phpunit] php5 ./phpunit
tests/TextUI/log-json-pre-66021.phpt
PHPUnit 4.3-gbf93bc2 by Sebastian Bergmann.

Configuration read from /data/fio/phpunit/phpunit.xml.dist

The Xdebug extension is not loaded. No code coverage will be generated.

.

Time: 134 ms, Memory: 2.25Mb

OK (1 test, 1 assertion)
[fredemmott@devbig076 ~/fio/phpunit] php5 ./phpunit
tests/TextUI/log-json-post-66021.phpt
PHPUnit 4.3-gbf93bc2 by Sebastian Bergmann.

Configuration read from /data/fio/phpunit/phpunit.xml.dist

The Xdebug extension is not loaded. No code coverage will be generated.

S

Time: 56 ms, Memory: 2.00Mb

There was 1 skipped test:

1) tests/TextUI/log-json-post-66021.phpt
PHP 5.4.(28+) or PHP 5.5.(12+) or PHP 5.6.0beta2+ or HHVM 3.(2+)
required

/data/fio/phpunit/src/Extensions/PhptTestCase.php:156
/data/fio/phpunit/src/Framework/TestSuite.php:675
/data/fio/phpunit/src/TextUI/TestRunner.php:427
/data/fio/phpunit/src/TextUI/Command.php:186
/data/fio/phpunit/src/TextUI/Command.php:138

OK, but incomplete, skipped, or risky tests!
Tests: 1, Assertions: 1, Skipped: 1.
[fredemmott@devbig076 ~/fio/phpunit]
```

(cherry picked from commit 8fdf5ff0df202957eca6c1d875138c6e48108c17)
Merge branch '4.1' into 4.2
Merge branch '4.2'
Merge branch '4.0' into 4.1
Merge branch '4.1' into 4.2
Merge branch '4.2'