Merge "Make HashBagOStuff::lock() compatible with BagOStuff::lock"