Improve cluster locking

Looking at the Cluster code, it updates instance variables in a number of places without taking locks. Since Cluster can be used by multiple threads concurrently, all instance variable accesses and updates generally must be locked.