Versions update for 1.2.18
Set stream ID on response for non-Exception Throwables

Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7470
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	NEWS.txt
	build.xml
	debian/changelog
Merge branch 'cassandra-2.0' into cassandra-2.1.0

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