One conflict on this MR came from Trigger/TrigDataAccess/TrigSerializeResult/share/bs-streamerinfos.root. @fwinkl suggested keeping the main version (so I did), which should be regenerated later. CC @cantel
Trigger/TrigDataAccess/TrigSerializeResult/share/bs-streamerinfos.root
This sweep contains the following MRs: