CRUNCH-363: Fixes protobufs to work with collection and union wrappers