=con #15699 Fix race in Cluster Sharding tests
Merge pull request #15722 from Sensatus/wip-15699-failed-cluster-sharding-spec-domblack

=con #15699 Fix race in Cluster Sharding tests