Merge "objectcache: Make SqlBagOStuff::waitForSlaves() no-op without slaves"