Cherry-pick: Merge branch 'int-test-increase-opa-wait' into 'release/0.27'

Bruce Jinrequested to merge
cherry-pick-482a1672 into release/0.27

Original MR: !930 (merged)

Edited by David Diederich

Merge request reports