Merge "objectcache: remove BagOStuff::mergeViaLock() and update RESTBagOStuff"