fix race referencing tokenMetadataCache
patch by jbellis; reviewed by rbranson for CASSANDRA-6485
merge from 1.2
Merge branch 'cassandra-2.0' into trunk