Ammar ben/bok choy shard 3

@jzoldak @clytwynec @muhammad-ammar 

This would replace #4986, effectively de-coupling the all-tests.sh change in #4988 from the shard organization. That way, we can still cherry pick *only* the all-tests.sh change as needed on older PRs that are being tested.