Reviewed-by: lancea, wetmore, naoto, iris, kevinw, xuelei
Replaces binding to wildacard with alternative less susceptible to intermittent failure in some intermittently failing tests. Reviewed-by: chegar, msheppar
Reviewed-by: darcy, ihse