Handle states for non-vnode clusters correctly.
Patch by brandonwilliams reviewed by slebresne for CASSANDRA-5127
Merge branch 'cassandra-1.2' into trunk