CPLAT-17298: Update TestID queries to check for both data-test-id and data-testid#47
Draft
kealjones-wk wants to merge 2 commits intomasterfrom multi-test-id-query
+24,801-24,568
data-test-id and data-testid#47