Merge "Added reentrant lock support to BagOStuff"