Also fixed race condition in main.connect2 test: we need to wait for
disconnected connections to actually decrease Threads_connected.