Fix NPE in StreamTransferTask.createMessageForRetry()

patch by Josh McKenzie; reviewed by Aleksey Yeschenko for CASSANDRA-7323
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt