Change the map used to reclaim peers so it is indexed by PeerName which should be unique over time, rather than NodeName which can be re-used. Create an auxilliary set of NodeNames to help. This way, if we can see that a different peer was previously running with the same node name, it can be included for reclaim.