Had a bug where, for retry events, was not inserting them into active
event map.  This meant that I could have two copies of events with the
same uuids on the same endpoint, and led to a bunch of problems.
Merge remote-tracking branch 'origin/master'