Merge "Use PHPUnit 4/6 compat in VersionCheckerTest"