Resolve merge conflicts
Resolve merge conflicts

gbleaney/Allocator-Benchmarks,jmptrader/bde,mversche/bde,RMGiroux/bde-allocator-benchmarks,apaprocki/bde,apaprocki/bde,minhlongdo/bde,idispatch/bde,frutiger/bde,bloomberg/bde,minhlongdo/bde,dharesign/bde,dbremner/bde,minhlongdo/bde,bowlofstew/bde,che2/bde,apaprocki/bde,bloomberg/bde-allocator-benchmarks,dbremner/bde,idispatch/bde,che2/bde,bloomberg/bde,jmptrader/bde,dharesign/bde,dharesign/bde,abeels/bde,frutiger/bde,saxena84/bde,idispatch/bde,jmptrader/bde,RMGiroux/bde-allocator-benchmarks,abeels/bde,bloomberg/bde-allocator-benchmarks,gbleaney/Allocator-Benchmarks,che2/bde,gbleaney/Allocator-Benchmarks,mversche/bde,jmptrader/bde,osubboo/bde,saxena84/bde,gbleaney/Allocator-Benchmarks,mversche/bde,bowlofstew/bde,che2/bde,bloomberg/bde-allocator-benchmarks,abeels/bde,RMGiroux/bde-allocator-benchmarks,RMGiroux/bde-allocator-benchmarks,dharesign/bde,dbremner/bde,idispatch/bde,RMGiroux/bde-allocator-benchmarks,osubboo/bde,osubboo/bde,bloomberg/bde,abeels/bde,bowlofstew/bde,minhlongdo/bde,bloomberg/bde-allocator-benchmarks,bloomberg/bde,bowlofstew/bde,abeels/bde,apaprocki/bde,abeels/bde,saxena84/bde,bloomberg/bde,saxena84/bde,apaprocki/bde,bloomberg/bde-allocator-benchmarks,mversche/bde,dbremner/bde,frutiger/bde,frutiger/bde,osubboo/bde