Merge "phpunit: Replace APC with HashBagOStuff during a test"