remove unused 'threadName' var
Merge branch 'cassandra-2.0' into trunk