Include ks name in failed streaming error message

Patch by Rajanarayanan Thottuvaikkatumana; reviewed by Tyler Hobbs for
CASSANDRA-8221
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt