Consolidate similar events

## EDDI version in which issue is found
3.7.0

## VoiceAttack version in which issue is found (as applicable)
N/A

## Steps to reproduce
N/A

## Expected
Events which share the same topic and properties are reasonably consolidated

## Observed
Events which share the same topic and properties are often unconsolidated

## Investigation
There likely are others, but I think this represents some of the low hanging fruit...

- [ ] The "Heat warning" and "Heat damage" events can be consolidated in to a single "Heat" event with an additional "type" property.
- [ ] The "Module sold" and "Module sold from storage" events can be consolidated into a single event with an additional "fromstorage" bool.
- [ ] The "Module stored" and "Modules stored" events can likely be consolidated into a single event that places each module to be stored into a list.
- [x] The "Promotion" journal entry generates "Combat promotion", "Trade promotion", "Exploration promotion", "Federation promotion" and "Empire promotion" events. These can be consolidated into a single event with an additional "type" property.
- [ ] The "RedeemVoucher" journal entry generates "Bounty redeemed", "Bond redeemed", "Trade voucher redeemed", and "Data Voucher redeemed" events. As discussed in #1888, these can be consolidated into a single event with an additional "type" property.
- [ ] The "Shields up" and "Shields down" events can be consolidated into a single "Shields" event, similar to the "Hardpoints" event.
- [ ] The "Ship sold" and "Ship sold on rebuy" events can be consolidated into a single "Ship sold" event with an additional "onrebuy" bool.

If all of the above were implemented, we'd have 12 less events to manage than we do now.