Make joining to the same node multiple times work, and reenable blackhole test. See #2930