Merge "Improved fail-over in ReplicatedBagOStuff for redis"