Citadel: rebuild bottles broken by protobuf 29.2 (part 1) (#2925)

Citadel: rebuild bottles broken by protobuf 29.2 (part 1) (#2925) #6076