ISPN-263 Handle cluster partitions

https://issues.jboss.org/browse/ISPN-263

I added one more commit with some test fixes.
Any reason why we are using a synchronized block and not declaring this as a synchronized in the method signature. I find it much more readable, and the IDE can point it to me