Abort liveRatio calculation if the memtable is flushed
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-8164
Merge branch 'cassandra-2.0' into cassandra-2.1
(cqlsh) SELECT ... TOKEN() function broken in C* 2.1.1

patch by Philip Thompson; reviewed by Mikhail Stepura for CASSANDRA-8258
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	pylib/cqlshlib/cql3handling.py