Bug 1088678 - Fix 2.1 integration tests cbs a=testonly