Bug 1088678 - Fix 2.1 integration tests cbs
Merge pull request #25531 from albertopq/1088678-fix-test-2.1

Bug 1088678 - Fix 2.1 integration tests cbs a=testonly r=kgrandon