Merge "objectcache: Hard deprecate ObjectCache::getMainStashInstance()"