authorithy-discovery: Make changing of peer-id while active a bit more robust

authorithy-discovery: Make changing of peer-id while active a bit more robust #3495