Merge "objectcache: make BagOStuff::mergeViaLock() timeout more sensible"