sharding fixes for 3+ stripes.
Merge branch 'master' into diffbot