Should there be more than one type of event in the output stream this is reflected as a list of EventTypes in the EventStreamInfo. This far the FileMetaData would only accept a single event type in for setting the MC channel ID. This change should ensure that there is a reasonable number in the FileMetaData, even in the case of ambiguity.
It should be possible to put this into all 21.X releases.