Setting severity via JMX broken
patch by Vijay; reviewed by rbranson for CASSANDRA-6996
Merge branch 'cassandra-2.0' into cassandra-2.1