Merge "Provide PHPUnit 4 and 6 compatibility layer"