Merge "Fixes for RedisBagOStuff when using twemproxy"