Fix NPE when table dropped during streaming

patch by yukim; reviewed by krummas for CASSANDRA-7946
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk