Fix deadlock and rebind issue with Riak cluster

- Add separate mutex for critical section in `RiakCluster` member tracking policy
- Move state for cluster to an attribute to enable rebind
- Minor tidy for `calculateClusterAddresses` string generation