[split] bump util to 6.22.2-SNAPSHOT

RB_ID=493423
TBR=true
NO-QUEUE=true
[split] bump ostrich to 9.6.2-SNAPSHOT

RB_ID=493469
TBR=true
NO-QUEUE=true
[split] birdcage: Add provides clause for ostrich

Add provides clause for ostrich so that it can be published by pants.

RB_ID=494065
Merge branch 'tmp' into develop