Rebalance acceptance test shards
Merge pull request #2002 from edx/will/rebalance-shards

Rebalance acceptance test shards