Fix deadlock and rebind issue with Riak cluster
This closes #393

* github/pr/393:
  Fix deadlock and rebind issue with Riak cluster