Merge "objectcache: Fix HashBagOStuffTest test in PHP 7.1"