Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	NEWS.txt
	build.xml
	debian/changelog

CHANGES.txt

@@ -13,6 +13,8 @@
  * Add option to disable STCS in L0 (CASSANDRA-6621)
  * Fix error when doing reversed queries with static columns (CASSANDRA-7490)
 Merged from 1.2:
+ * Set correct stream ID on responses when non-Exception Throwables
+   are thrown while handling native protocol messages (CASSANDRA-7470)
 
 
 2.0.9

src/java/org/apache/cassandra/transport/Message.java

@@ -312,7 +312,7 @@ public abstract class Message
 
                 ctx.getChannel().write(response);
             }
-            catch (Exception ex)
+            catch (Throwable ex)
             {
                 // Don't let the exception propagate to exceptionCaught() if we can help it so that we can assign the right streamID.
                 ctx.getChannel().write(ErrorMessage.fromException(ex).setStreamId(request.getStreamId()));