Try HHVM nightly since 3.1 has regressions.
Test against hhvm-nightly since 3.1 has regressions.
Merge branch '4.1' into 4.2
Merge branch '4.2'
Fix flaky test.