Merge lorne/sampi clients
cluster: Don't return from NewClient until connected