Re-committing changes from r76825 to BumpPtrAllocator with a fix and tests for