Fix how credentials are merged

[breakid]

The way credentials are merged now, it's possible for more recent data to be overwritten by older data when re-categorizing "Unknown" data. This was known at the time, but the re-categorization code was particularly complex, and this was deemed "good enough" for a prototype.