Merge "PHPUnit bootstrap: less aggressive unsetting of globals"