Cleanup connection close a bit, ensure we wait for the close request to
reach the Broker.